门岗

src/api/combatduty/ReteOfTen.js

@@ -57,3 +57,19 @@ export function getzbky(){
   })
 }
 
+// 获取编辑装备五率接口
+export function addzbwl(data) {
+  return request({
+    url: '/peoplefiverates/outfitinfo/list',
+    method: 'get',
+    data: data
+  })
+}
+
+// 获取编辑六量接口
+export function getliulian(){
+  return request({
+    url:"/peoplefiverates/measureinfo/list",
+    method:"get",
+  })
+}

src/api/doormanManage/bdglVisit.js

@@ -0,0 +1,62 @@
+import request from '@/utils/request'
+
+// 查询人员来访登记列表
+export function listBdglVisit(query) {
+  return request({
+    url: '/doormanManage/bdglVisit/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询人员来访登记详细
+export function getBdglVisit(id) {
+  return request({
+    url: '/doormanManage/bdglVisit/' + id,
+    method: 'get'
+  })
+}
+
+// 新增人员来访登记
+export function addBdglVisit(data) {
+  return request({
+    url: '/doormanManage/bdglVisit',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改人员来访登记
+export function updateBdglVisit(data) {
+  return request({
+    url: '/doormanManage/bdglVisit',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除人员来访登记
+export function delBdglVisit(id) {
+  return request({
+    url: '/doormanManage/bdglVisit/' + id,
+    method: 'delete'
+  })
+}
+
+// 导出人员来访登记
+export function exportBdglVisit(query) {
+  return request({
+    url: '/doormanManage/bdglVisit/export',
+    method: 'get',
+    params: query
+  })
+}
+
+
+// 获取当前部门接待人
+export function deptUser (deptId) {
+  return request({
+    url: `/grassrootsregistration/common/getZhuChiRen?deptId=${deptId}`,
+    method: 'get'
+  })
+}

src/assets/styles/global.css

@@ -652,6 +652,13 @@ background-color: #1d96ff;
   text-indent: 1em;
 }
 /* 工作任务表格 */
-.workTask .el-table__empty-block{
+/* .workTask .el-table__empty-block{
   border-bottom: 2px solid white !important;
 }
+.el-time-panel__content .el-scrollbar__wrap .el-scrollbar__view{
+  background-color: white !important;
+}
+.el-date-picker__editor-wrap .el-input__inner{
+  color: black;
+} */
+

src/layout/components/Sidebar/index.vue

@@ -62,6 +62,7 @@ export default {
     }
   },
   created() {
+    console.log(this.$route.query.name)
     //   this.routs=this.sidebarRouters
     if (this.$route.query.name) {
       this.sidebarRoutersfun();
@@ -74,8 +75,8 @@ export default {
     sidebarRoutersfun() {
       this.sidebarRouters.map(item => {
         if (item.path == this.$route.query.name) {
+          console.log(11)
           this.routs.push(item);
-          console.log(this.routs)
         }
       });
     }

src/views/combatduty/RateOfTen/index.vue

@@ -287,16 +287,20 @@
            <el-input  v-model="form.bzrs" class="BIANJI"></el-input>
         </el-form-item>
         <el-form-item label="实际人数" prop="sjrs">
-          <div class="thistexts">{{ this.form.sjrs }}</div>
+          <el-input  v-model="form.sjrs" class="BIANJI" :disabled="true"></el-input>
+          <!-- <div class="thistexts">{{ this.form.sjrs }}</div> -->
         </el-form-item>
         <el-form-item label="在位人数" prop="zwrs">
-          <div class="thistexts">{{ this.form.zwrs }}</div>
+           <el-input  v-model="form.zwrs" class="BIANJI" :disabled="true"></el-input>
+          <!-- <div class="thistexts">{{ this.form.zwrs }}</div> -->
         </el-form-item>
         <el-form-item label="对口人数" prop="dkrs">
-          <div class="thistexts">{{ this.form.dkrs }}</div>
+          <el-input  v-model="form.dkrs" class="BIANJI" :disabled="true"></el-input>
+          <!-- <div class="thistexts">{{ this.form.dkrs }}</div> -->
         </el-form-item>
         <el-form-item label="出动人数" prop="cdrs">
-          <div class="thistexts">{{ this.form.cdrs }}</div>
+          <el-input  v-model="form.cdrs" class="BIANJI" :disabled="true"></el-input>
+          <!-- <div class="thistexts">{{ this.form.cdrs }}</div> -->
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -339,7 +343,8 @@
            <el-input  v-model="form1.zbsy" class="BIANJI"></el-input>
         </el-form-item>
         <el-form-item prop="zbky" label="装备可用数">
-          <div class="thistexts">{{ this.form1.zbky }}</div>
+          <el-input  v-model="form1.zbky" class="BIANJI" :disabled="true"></el-input>
+          <!-- <div class="thistexts">{{ this.form1.zbky }}</div> -->
         </el-form-item>
         <el-form-item prop="name" label="实际配套数">
           <!-- <el-input-number
@@ -474,7 +479,10 @@ import {
   updatezbwl,
   getzbwl,
   // 获取装备可用接口
-  getzbky
+  getzbky,
+  // 获取装备五率接口
+  addzbwl,
+  getliulian
 } from "@/api/combatduty/ReteOfTen";
 export default {
   data() {
@@ -558,9 +566,15 @@ export default {
     editor2() {
       this.open1 = true;
       this.form1.zbky=this.zbky
+      addzbwl().then(res=>{
+        this.form1=res.rows[0]
+      })
     },
     editor3() {
       this.open2 = true;
+      getliulian().then(res=>{
+        this.form2=res.rows[0]
+      })
     },
     // 编辑人员五率确定
     submitForm() {
@@ -784,7 +798,7 @@ export default {
       let data44=this.form.cdrs
       var data5 = [
         {
-          value: 6,
+          value: 5,
           name: "军事训练成绩达到合格人数",
         },
         {
@@ -793,7 +807,7 @@ export default {
         },
       ];
       data5[1].value = this.form.zwrs - data5[0].value;
-
+      let data55=this.form.zwrs
       var data6 = [
         {
           value: this.zhuangbei.zbsy,
@@ -1019,13 +1033,19 @@ export default {
                 name: { color: "#fff", fontSize: 14 },
               },
               formatter: function (params) {
-                var n = _this.form.bzrs / _this.form.cdrs;
-                var s =
+                if(_this.form.cdrs==0){
+                  var s=`异常`
+                    return s
+                }else{
+                  var n = _this.form.bzrs / _this.form.cdrs;
+                  var s =
                   `{value|${(n * 100).toFixed()}%}` +
                   "\n" +
                   "\n" +
                   `{name|出动率}`;
                 return s;
+                }
+                
               },
             },
             // itemStyle: {
@@ -1042,14 +1062,14 @@ export default {
           position: ["10%", "50%"],
           formatter: function (params) {
             return (
-              data5[0].name +
+              data2[0].name +
               "(" +
-              data5[0].value +
+              data55 +
               ")" +
               ":" +
-              data2[0].name +
+              data5[0].name +
               "(" +
-              data2[0].value +
+            data5[0].value +
               ")"
             );
           },

src/views/doormanManage/bdglVisit/index.vue

@@ -0,0 +1,507 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="100px">
+      <el-form-item label="到访单位" prop="unitId">
+        <el-input
+          v-model="queryParams.unitId"
+          placeholder="请输入到访单位"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="接待人" prop="peopleId">
+        <el-input
+          v-model="queryParams.peopleId"
+          placeholder="请输入接待人"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="到访人员姓名" prop="name">
+        <el-input
+          v-model="queryParams.name"
+          placeholder="请输入到访人员姓名"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+       <el-form-item label="到访时间" prop="arriveTime" style="margin-left:20px">
+          <el-date-picker clearable size="small"
+            v-model="form.arriveTime"
+            type="datetime"
+            placeholder="选择到访时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="离队时间" prop="endTime">
+          <el-date-picker clearable size="small"
+            v-model="form.endTime"
+            type="datetime"
+            placeholder="选择离队时间">
+          </el-date-picker>
+        </el-form-item>
+      <el-form-item class="search">
+        <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="['doormanManage:bdglVisit: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="['doormanManage:bdglVisit: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="['doormanManage:bdglVisit:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          :loading="exportLoading"
+          @click="handleExport"
+          v-hasPermi="['doormanManage:bdglVisit:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="bdglVisitList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <!-- <el-table-column label="接待人姓名" align="center" prop="id" /> -->
+      <el-table-column label="到访单位" align="center" prop="unitId" :formatter="unit2Format"/>
+      <el-table-column label="接待人" align="center" prop="peopleName"  />
+      <el-table-column label="到访人员姓名" align="center" prop="name" />
+      <el-table-column label="到访时间" align="center" prop="arriveTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.arriveTime, '{y}-{m}-{d} {h}:{m}:{s}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="离队时间" align="center" prop="endTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.endTime, '{y}-{m}-{d} {h}:{m}:{s}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="到访车牌号" align="center" prop="numberPlate" />
+      <el-table-column label="来访原因" align="center" prop="contents" />
+      <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="['doormanManage:bdglVisit:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['doormanManage:bdglVisit: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="1200px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="110px"  :inline="true">
+        <el-form-item label="到访单位" prop="unitId" style="margin-left:20px">
+          <treeselect
+            v-model="form.unitId"
+            :options="users"
+            placeholder="请选择到访单位"
+            class="threeselects"
+            @select="selectPeo"
+          />
+          <!-- <el-input v-model="form.unitId" placeholder="请输入到访单位" /> -->
+        </el-form-item>
+        <el-form-item label="接待人" prop="peopleId">
+          <!-- <el-input v-model="form.peopleId" placeholder="请输入接待人" /> -->
+          <el-select
+                v-model="form.peopleName"
+                placeholder="请选择接待人"
+                id="execute"
+                ref="peoplenames"
+              >
+                <el-option
+                  v-for="item in executor"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.name"
+                  @click.native="peopleIds(item.id)"
+                  id="execute"
+                />
+              </el-select>
+        </el-form-item>
+        <el-form-item label="到访人员姓名" prop="name">
+          <el-input v-model="form.name" placeholder="请输入到访人员姓名" />
+        </el-form-item>
+        <el-form-item label="到访时间" prop="arriveTime" style="margin-left:20px">
+          <el-date-picker clearable size="small"
+            v-model="form.arriveTime"
+            type="datetime"
+            placeholder="选择到访时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="离队时间" prop="endTime">
+          <el-date-picker clearable size="small"
+            v-model="form.endTime"
+            type="datetime"
+            placeholder="选择离队时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="到访车牌号" prop="numberPlate">
+          <el-input v-model="form.numberPlate" placeholder="请输入到访车牌号" />
+        </el-form-item>
+        <div class="jiben" style="margin-left:20px">来访原因</div>
+        <el-form-item  prop="contents" class="daofang" style="margin-left:20px">
+          <el-input v-model="form.contents" 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 { listBdglVisit, getBdglVisit, delBdglVisit, addBdglVisit, updateBdglVisit, exportBdglVisit, deptUser } from "@/api/doormanManage/bdglVisit";
+import Treeselect from "@riophae/vue-treeselect";
+import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+import { getDept2 } from "@/api/grassrootsregistration/bdglmeeting";
+import {allUser} from "@/api/workingArrangements/workTask"
+
+export default {
+  name: "BdglVisit",
+  components: { Treeselect },
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 导出遮罩层
+      exportLoading: false,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 人员来访登记表格数据
+      bdglVisitList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        unitId: null,
+        peopleId: null,
+        name: null,
+        arriveTime: null,
+        endTime: null,
+        adminId: null,
+        contents: null,
+        createtime: null,
+        updatetime: null,
+        numberPlate: null,
+        unitName: null,
+        peopleName: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        unitId: [{ required: true, message: "到访单位不能为空", trigger: "blur" }],
+        // peopleId: [{ required: true, message: "接待人不能为空", trigger: "blur" }],
+        name: [{ required: true, message: "到访人员姓名不能为空", trigger: "blur" }],
+        arriveTime: [{ required: true, message: "到访时间不能为空", trigger: "blur" }],
+        endTime: [{ required: true, message: "离队时间不能为空", trigger: "blur" }],
+        numberPlate: [{ required: true, message: "到访车牌号不能为空", trigger: "blur" }],
+      },
+      // 执行单位列表
+      users: [],
+      // 接待人
+      executor:[],
+      // 人员列表
+      rylist:[]
+    };
+  },
+  created() {
+    this.getList();
+    allUser().then((res) => {
+      this.rylist = res.rows;
+    });
+  },
+  methods: {
+    unit2Format(row, column) {
+      var deptName = "";
+      deptName=row.unitName
+      // if(this.bdglVisitList[0].unitId==row.unitId){
+      //   deptName=row.unitName
+      // }
+      return deptName;
+    },
+    peopleIds(id){
+      this.form.peopleId=id
+      console.log(id)
+    },
+    // 获取执行人
+    getZhuChi(id) {
+      deptUser(id).then((res) => {
+        this.executor = res.data;
+        console.log(this.executor)
+      });
+    },
+    // 到访单位选中触发
+    selectPeo(val) {
+      this.form.unitId = val.id;
+      // console.log(this.form.unitId)
+      this.getZhuChi(this.form.unitId);
+    },
+    /** 查询人员来访登记列表 */
+    getList() {
+      this.loading = true;
+      listBdglVisit(this.queryParams).then(response => {
+        // console.log(response)
+        this.bdglVisitList = response.rows;
+        console.log(this.bdglVisitList)
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        unitId: null,
+        peopleId: null,
+        name: null,
+        arriveTime: null,
+        endTime: null,
+        adminId: null,
+        contents: null,
+        createtime: null,
+        updatetime: null,
+        numberPlate: null,
+        unitName: null,
+        peopleName: 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 = "添加人员来访登记";
+      // 获取执行单位列表
+      getDept2().then((res) => {
+        // console.log(res,2)
+        this.users = res.data;
+        console.log(this.users);
+      });
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      getDept2().then((res) => {
+        // console.log(res,2)
+        this.users = res.data;
+        console.log(this.users);
+      });
+      const id = row.id || this.ids
+      getBdglVisit(id).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改人员来访登记";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      console.log(this.form)
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.id != null) {
+            updateBdglVisit(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addBdglVisit(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$modal.confirm('是否确认删除人员来访登记编号为"' + ids + '"的数据项？').then(function() {
+        return delBdglVisit(ids);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$modal.confirm('是否确认导出所有人员来访登记数据项？').then(() => {
+        this.exportLoading = true;
+        return exportBdglVisit(queryParams);
+      }).then(response => {
+        this.$download.name(response.msg);
+        this.exportLoading = false;
+      }).catch(() => {});
+    }
+  }
+};
+</script>
+<style scoped>
+::v-deep .el-dialog{
+   background-color: #004d86 !important;
+}
+/* 输入框 */
+::v-deep .el-dialog .el-input__inner{
+  background-color: #004d86 !important;
+  width: 220px;
+  color: white;
+}
+/* 标题弹框 */
+::v-deep .el-dialog__title{
+  color: white;
+  /* border-bottom: 1px solid white; */
+}
+/* 标题下划线 */
+::v-deep .el-dialog__header{
+  border-bottom: 1px solid white;
+}
+::v-deep .el-form-item__content{
+  width: 250px;
+}
+::v-deep .el-form-item__label{
+  text-align: start;
+}
+/* ::v-deep .el-form-item{
+  width: 200px;
+} */
+/* ::v-deep .jiedainame .el-form-item__label{
+  width: 90px !important;
+}
+::v-deep .el-input--small .el-input__inner{
+  width: 230px;
+} */
+::v-deep .el-textarea .el-textarea__inner{
+  /* text-align: center; */
+  width: 1080px;
+  height: auto !important;
+  min-height: 130px !important;
+}
+/* 到访单位 */
+::v-deep .el-form-item__content .el-input--small .el-input__inner{
+  width: 220px;
+}
+/* 表格头部 */
+v-deep .el-table thead tr{
+  background-color: #004d86 !important;
+}
+/* 树形 */
+.threeselects {
+  width: 200px;
+}
+.threeselects .vue-treeselect__input {
+  background-color: #004d86;
+  /* color: white; */
+}
+::v-deep .search .el-form-item__content{
+  margin-top: 0px;
+}
+::v-deep .el-picker-panel__body{
+  background-color: #004d86 !important;
+}
+::v-deep .vue-treeselect__control{
+  background-color: #004d86;
+  color: white;
+}
+::v-deep .vue-treeselect__single-value{
+  color: white;
+}
+::v-deep .threeselects{
+  width: 220px;
+}
+#execute{
+  color: white !important;
+}
+
+</style>

src/views/pt.vue

@@ -78,7 +78,7 @@
               </div>
             </li>
             <li>
-              <div class="demo active" data-url="/diary?ref=addtabs">
+              <div class="demo active" data-url="/diary?ref=addtabs" v-on:click="mengangfun">
                 <img src="../images/ag.png" alt />
                 <br />
                 <a href="#" class="a">门岗管理</a>
@@ -351,9 +351,14 @@ export default {
         .push({ path: "/index", query: { name: "/system" } })
         .catch(() => {});
     },
+    mengangfun() {
+      this.$router
+        .push({ path: "/index", query: { name: "/doormanManage" } })
+        .catch(() => {});
+    },
     gongju() {
       this.$router
-        .push({ path: "/index", query: { name: "/tool" } })
+        .push({ path: "/index", query: { name: "/tool" } }) 
         .catch(() => {});
     },
     wenyinfun() {

src/views/regulations/fileinfo/index.vue

@@ -137,6 +137,18 @@
           </template>
         </el-table-column>
       </el-table>
+      <!-- <el-pagination
+      :background="background"
+      :current-page.sync="currentPage"
+      :page-size.sync="queryParams.pageSize"
+      :layout="layout"
+      :page-sizes="queryParams.pageNum"
+      :pager-count="pagerCount"
+      :total="total"
+      v-bind="$attrs"
+      @size-change="handleSizeChange"
+      @current-change="handleCurrentChange"
+    /> -->
       <pagination
         v-show="total > 0"
         :total="total"
@@ -152,8 +164,8 @@
         <div class="jichu">
           目录
           <el-button class="turnback" @click="turnback" v-if="addbtn==0">返回上级</el-button>
-          <el-button class="uploadfilesbtn" :class="addbtn?'margins':''" @click="upload">上传文件</el-button
-          ><el-button class="manage" @click="mange">目录管理</el-button>
+          <el-button class="uploadfilesbtn" :class="addbtn?'margins':''" @click="upload" v-if="addbtn!=0">上传文件</el-button
+          ><el-button class="manage" @click="mange" v-if="addbtn!=0">目录管理</el-button>
         </div>
         <el-table
           v-loading="loading"
@@ -168,9 +180,10 @@
               <div
                 @click="mulus(scope.row)"
                 :class="scope.row.subclassification == 0 ? '' : 'undeline'"
+                style="position:relative;cursor:pointer"
               >
-              <img src="../../../images/文件夹.png" alt="" style="margin-right:5px">
-              <span> {{ scope.row.directory }}</span>
+              <img src="../../../images/文件夹.png" alt="" style="margin-right:5px;position:absolute;left:5px;top:2px">
+              <span style="margin-left:25px"> {{ scope.row.directory }}</span>
               </div>
             </template>
           </el-table-column>
@@ -605,10 +618,7 @@ export default {
     // 点击目录根据子目录的数量控制他是否可以点进去进行渲染
     mulus(row) {
       this.parentId = row.id;
-      // console.log(row.id)
       this.form.directoryId=row.id
-      console.log(this.form.directoryId)
-      // this.listFileinfo({directoryId:this.form.directoryId})
       listFileinfo({directoryId:this.form.directoryId}).then(res=>{
         this.fileinfoList = res.rows;
         this.total = res.total;
@@ -628,6 +638,7 @@ export default {
     // 返回目录
     turnback() {
       this.addbtn=true
+      this.getList()
       this.ListDirectoryinfo();
     },
     // 选中父目录之后
@@ -641,11 +652,12 @@ export default {
     },
     /** 查询规章制度文件记录列表 */
     getList() {
-      // this.loading = true;
-      listFileinfo(this.form.directoryId).then((response) => {
-        console.log(response)
+      this.loading = true;
+      listFileinfo(this.queryParams).then((response) => {
+        console.log(response.total)
         this.fileinfoList = response.rows;
         this.total = response.total;
+        this.loading=false
       });
     },
     // 取消按钮
@@ -725,10 +737,10 @@ export default {
           console.log(this.form);
           // 上传文件接口
           addFileinfo(this.form).then((response) => {
+            this.ListDirectoryinfo();
             this.$modal.msgSuccess("上传成功");
             this.open = false;
             this.getList();
-            // this.listDirectoryinfo();
           });
         }
       });
@@ -770,11 +782,16 @@ export default {
       this.$modal
         .confirm("是否确认删除？")
         .then(function () {
+          this.ListDirectoryinfo();
+            this.getList();
           return delDirectoryinfo(ids);
         })
         .then(() => {
           this.ListDirectoryinfo();
+          this.loading=false
+          this.loading1=false
           this.$modal.msgSuccess("删除成功");
+
         })
         .catch(() => {});
     },
@@ -847,6 +864,7 @@ export default {
   line-height: 40px;
   border-left: 4px solid rgba(29, 150, 255, 1);
   text-indent: 1em;
+ 
 }
 /* 文件表格 */
 .tablesfile {
@@ -1043,7 +1061,7 @@ table {
   line-height: 33px;
   margin-left: 30px;
   text-align: center;
-  margin-left: 300px;
+  margin-left: 450px;
   color: #ccc;
   background: #00365f;
 }
@@ -1059,6 +1077,13 @@ table {
   border-radius: 4px;
   margin-left: 10px;
 }
+.pagination-container {
+  background: #fff;
+  padding: 32px 16px;
+}
+.pagination-container.hidden {
+  display: none;
+}
 /* 弹框样式修改 */
 ::v-deep .el-dialog {
   background-color: #004d86 !important;
@@ -1195,4 +1220,7 @@ body,
 ::v-deep .guizhangzhidu .el-select-dropdown__list{
   background: white !important;
 }
+::v-deep .el-table_2_column_13 .cell{
+  text-align: center !important;
+}
 </style>

src/views/workingArrangements/planTask/index.vue

@@ -1446,4 +1446,7 @@ export default {
 ::v-deep .el-table th.el-table__cell{
   background-color: pink !important;
 }
+.el-table__empty-block{
+  border-bottom: 1px solid white;
+}
 </style>

src/views/workingArrangements/workTask/index.vue

@@ -1343,5 +1343,7 @@ export default {
   text-overflow: ellipsis;
   white-space: nowrap;
 }
-
+.el-table__empty-block{
+  border-bottom: 1px solid white;
+}
 </style>

vue.config.js

@@ -1,119 +0,0 @@
-
-'use strict'
-const path = require('path')
-
-function resolve(dir) {
-  return path.join(__dirname, dir)
-}
-
-const name = process.env.VUE_APP_TITLE || '智能督察管理平台' // 网页标题
-
-const port = process.env.port || process.env.npm_config_port || 80 // 端口
-
-// vue.config.js 配置说明
-//官方vue.config.js 参考文档 https://cli.vuejs.org/zh/config/#css-loaderoptions
-// 这里只列一部分，具体配置参考文档
-module.exports = {
-  // 部署生产环境和开发环境下的URL。
-  // 默认情况下，Vue CLI 会假设你的应用是被部署在一个域名的根路径上
-  // 例如 https://www.supervision.vip/。如果应用被部署在一个子路径上，你就需要用这个选项指定这个子路径。例如，如果你的应用被部署在 https://www.supervision.vip/admin/，则设置 baseUrl 为 /admin/。
-  publicPath: process.env.NODE_ENV === "production" ? "/" : "/",
-  // 在npm run build 或 yarn build 时 ，生成文件的目录名称（要和baseUrl的生产环境路径一致）（默认dist）
-  outputDir: 'dist',
-  // 用于放置生成的静态资源 (js、css、img、fonts) 的；（项目打包之后，静态资源会放在这个文件夹下）
-  assetsDir: 'static',
-  // 是否开启eslint保存检测，有效值：ture | false | 'error'
-  lintOnSave: process.env.NODE_ENV === 'development',
-  // 如果你不需要生产环境的 source map，可以将其设置为 false 以加速生产环境构建。
-  productionSourceMap: false,
-  // webpack-dev-server 相关配置
-  devServer: {
-    host: '0.0.0.0',
-    port: port,
-    open: true,
-    proxy: {
-      // detail: https://cli.vuejs.org/config/#devserver-proxy
-      [process.env.VUE_APP_BASE_API]: {
-        // target: `http://192.168.5.177:8080`,
-        target: `http://192.168.5.66:8089`,
-        changeOrigin: true,
-        pathRewrite: {
-          ['^' + process.env.VUE_APP_BASE_API]: ''
-        }
-      }
-    },
-    disableHostCheck: true
-  },
-  configureWebpack: {
-    name: name,
-    resolve: {
-      alias: {
-        '@': resolve('src')
-      }
-    }
-  },
-  chainWebpack(config) {
-    config.plugins.delete('preload') // TODO: need test
-    config.plugins.delete('prefetch') // TODO: need test
-
-    // set svg-sprite-loader
-    config.module
-      .rule('svg')
-      .exclude.add(resolve('src/assets/icons'))
-      .end()
-    config.module
-      .rule('icons')
-      .test(/\.svg$/)
-      .include.add(resolve('src/assets/icons'))
-      .end()
-      .use('svg-sprite-loader')
-      .loader('svg-sprite-loader')
-      .options({
-        symbolId: 'icon-[name]'
-      })
-      .end()
-
-    config
-      .when(process.env.NODE_ENV !== 'development',
-        config => {
-          config
-            .plugin('ScriptExtHtmlWebpackPlugin')
-            .after('html')
-            .use('script-ext-html-webpack-plugin', [{
-              // `runtime` must same as runtimeChunk name. default is `runtime`
-              inline: /runtime\..*\.js$/
-            }])
-            .end()
-          config
-            .optimization.splitChunks({
-              chunks: 'all',
-              cacheGroups: {
-                libs: {
-                  name: 'chunk-libs',
-                  test: /[\\/]node_modules[\\/]/,
-                  priority: 10,
-                  chunks: 'initial' // only package third parties that are initially dependent
-                },
-                elementUI: {
-                  name: 'chunk-elementUI', // split elementUI into a single package
-                  priority: 20, // the weight needs to be larger than libs and app or it will be packaged into libs or app
-                  test: /[\\/]node_modules[\\/]_?element-ui(.*)/ // in order to adapt to cnpm
-                },
-                commons: {
-                  name: 'chunk-commons',
-                  test: resolve('src/components'), // can customize your rules
-                  minChunks: 3, //  minimum common number
-                  priority: 5,
-                  reuseExistingChunk: true
-                }
-              }
-            })
-          config.optimization.runtimeChunk('single'),
-          {
-            from: path.resolve(__dirname, './public/robots.txt'), //防爬虫文件
-            to: './' //到根目录下
-          }
-        }
-      )
-  }
-}