sunyanqiang 2 سال پیش
والد
کامیت
a63a4d1dd1

+ 44 - 0
src/api/system/diary.js

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询要事日记设置 列表
+export function listDiary(query) {
+  return request({
+    url: '/system/diary/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询要事日记设置 详细
+export function getDiary(id) {
+  return request({
+    url: '/system/diary/' + id,
+    method: 'get'
+  })
+}
+
+// 新增要事日记设置 
+export function addDiary(data) {
+  return request({
+    url: '/system/diary',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改要事日记设置 
+export function updateDiary(data) {
+  return request({
+    url: '/system/diary',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除要事日记设置 
+export function delDiary(id) {
+  return request({
+    url: '/system/diary/' + id,
+    method: 'delete'
+  })
+}

+ 0 - 44
src/api/system/diaryset.js

@@ -1,44 +0,0 @@
-import request from '@/utils/request'
-
-// 查询要事日记设置列表
-export function listDiaryset(query) {
-  return request({
-    url: '/system/diaryset/list',
-    method: 'get',
-    params: query
-  })
-}
-
-// 查询要事日记设置详细
-export function getDiaryset(id) {
-  return request({
-    url: '/system/diaryset/' + id,
-    method: 'get'
-  })
-}
-
-// 新增要事日记设置
-export function addDiaryset(data) {
-  return request({
-    url: '/system/diaryset',
-    method: 'post',
-    data: data
-  })
-}
-
-// 修改要事日记设置
-export function updateDiaryset(data) {
-  return request({
-    url: '/system/diaryset',
-    method: 'put',
-    data: data
-  })
-}
-
-// 删除要事日记设置
-export function delDiaryset(id) {
-  return request({
-    url: '/system/diaryset/' + id,
-    method: 'delete'
-  })
-}

+ 6 - 6
src/views/PrintsManage/manage/index.vue

@@ -112,18 +112,18 @@
         </template>
       </el-table-column>
       <!-- <el-table-column label="路径" align="center" prop="file" /> -->
-      <el-table-column label="类型" align="center" prop="type" />
-      <el-table-column label="是否彩打" align="center" prop="isPrintColor">
+      <el-table-column label="类型" align="center" prop="type" width="50"/>
+      <el-table-column label="是否彩打" align="center" prop="isPrintColor" width="100">
         <template slot-scope="scope">
           <span>{{ scope.row.isPrintColor == 0 ? "否" : "是" }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="是否双面打" align="center" prop="isPrintTwo">
+      <el-table-column label="是否双面打" align="center" prop="isPrintTwo" width="100">
         <template slot-scope="scope">
           <span>{{ scope.row.isPrintTwo == 0 ? "否" : "是" }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="打印状态" align="center" prop="printStatus">
+      <el-table-column label="打印状态" align="center" prop="printStatus" width="100">
         <template slot-scope="scope">
           <span
             style="color: #90da90"
@@ -152,12 +152,12 @@
           >
         </template>
       </el-table-column>
-      <el-table-column label="级别" align="center" prop="levelM">
+      <el-table-column label="级别" align="center" prop="levelM" width="100">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.level" :value="scope.row.levelM" />
         </template>
       </el-table-column>
-      <el-table-column label="发送人" align="center" prop="sendName" />
+      <el-table-column label="发送人" align="center" prop="sendName" width="80"/>
       <el-table-column
         label="发送时间"
         align="center"

+ 4 - 4
src/views/combatduty/PeopleStatistics/index.vue

@@ -354,15 +354,15 @@ export default {
   margin-top: 40px;
 }
 ::v-deep .dialog-footer {
-  margin-left: 44%;
+  margin-left: 78%;
+  margin-top: -12%;
 }
 ::v-deep .el-form-item__label {
   margin-bottom: 30px;
 }
 .form-box {
-  width: 658px;
-  margin: auto;
-  margin-top: 200px;
+  width: 800px;
+  margin-top: 280px;
 }
 ::v-deep .el-radio {
   color: #fff;

+ 1 - 0
src/views/combatduty/grassdutyinfo/index.vue

@@ -179,6 +179,7 @@
             align="center"
             prop="dutyGangwei"
             :formatter="dutyGangweiFormat"
+            width="150"
           />
           <el-table-column
             label="值班时间"

+ 41 - 25
src/views/combatduty/regisdutyinfo/index.vue

@@ -178,7 +178,24 @@
       <!-- <el-table-column label="主键ID" align="center" prop="id" /> -->
       <el-table-column label="单位名称" align="center" prop="unitName" />
       <!-- <el-table-column label="单位ID" align="center" prop="unitId" /> -->
-      <el-table-column label="装备名称" align="center" prop="equipmentName" />
+      <el-table-column label="装备名称" align="center" prop="equipmentName">
+        <template slot-scope="scope">
+          <el-tooltip :content="scope.row.equipmentName" placement="top">
+            <div
+              style="
+                overflow: hidden;
+                display: -webkit-box;
+                text-overflow: ellipsis;
+                -webkit-line-clamp: 2;
+                -webkit-box-orient: vertical;
+                white-space: normal;
+              "
+            >
+              {{ scope.row.equipmentName }}
+            </div>
+          </el-tooltip>
+        </template>
+      </el-table-column>
       <!-- <el-table-column label="装备ID" align="center" prop="equipmentId" /> -->
       <el-table-column label="装备数量" align="center" prop="equipmentNumber" />
       <el-table-column label="类型" align="center" prop="type">
@@ -327,7 +344,7 @@
             >
             </el-date-picker>
           </el-form-item>
-           <el-form-item label="是否值班" prop="isnoduty">
+          <el-form-item label="是否值班" prop="isnoduty">
             <el-select v-model="item.isonduty" placeholder="">
               <el-option
                 v-for="dict in zhiban"
@@ -337,7 +354,7 @@
               ></el-option>
             </el-select>
           </el-form-item>
-          <el-form-item >
+          <el-form-item>
             <el-button
               type="primary"
               icon="el-icon-plus"
@@ -446,16 +463,16 @@
           >
           </el-date-picker>
         </el-form-item>
-           <el-form-item label="是否值班" prop="isnoduty">
-            <el-select v-model="form.isonduty" placeholder="">
-              <el-option
-                v-for="dict in zhiban"
-                :key="dict.value"
-                :label="dict.label"
-                :value="dict.value"
-              ></el-option>
-            </el-select>
-          </el-form-item>
+        <el-form-item label="是否值班" prop="isnoduty">
+          <el-select v-model="form.isonduty" placeholder="">
+            <el-option
+              v-for="dict in zhiban"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            ></el-option>
+          </el-select>
+        </el-form-item>
         <div class="jiben">装备情况</div>
         <el-form-item label="" prop="remarks">
           <el-input v-model="form.remarks" type="textarea" placeholder="" />
@@ -490,15 +507,15 @@ export default {
       // 导出遮罩层
       exportLoading: false,
       // 是否值班
-      zhiban:[
+      zhiban: [
         {
-          label:"是",
-          value:"0"
+          label: "是",
+          value: "0",
+        },
+        {
+          label: "否",
+          value: "1",
         },
-         {
-          label:"否",
-          value:"1"
-        }
       ],
       // 选中数组
       ids: [],
@@ -547,8 +564,7 @@ export default {
           equipmentStates: null,
           attendedTime: null,
           standbyPosition: null,
-          isonduty:null
-          
+          isonduty: null,
         },
       ],
       // 修改弹出层显示与隐藏
@@ -575,7 +591,7 @@ export default {
         equipmentStates: null,
         attendedTime: null,
         standbyPosition: null,
-        isonduty:null
+        isonduty: null,
       });
     },
     //删除多个基本信息
@@ -601,7 +617,7 @@ export default {
     // 取消按钮
     cancel() {
       this.open = false;
-      this.open1=false
+      this.open1 = false;
       this.reset();
     },
     // 表单重置
@@ -628,7 +644,7 @@ export default {
           equipmentStates: null,
           attendedTime: null,
           standbyPosition: null,
-          isonduty:null
+          isonduty: null,
         },
       ];
       this.resetForm("form");

+ 2 - 2
src/views/grassrootsregistration/bdglarmament/index.vue

@@ -113,14 +113,14 @@
         label="登记日期"
         align="center"
         prop="recordDate"
-        width="180"
+        width="120"
       >
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.recordDate, "{y}-{m}-{d}") }}</span>
         </template>
       </el-table-column>
       <el-table-column label="计量单位" align="center" prop="metering" />
-      <el-table-column label="交接依据" align="center" prop="gist" />
+      <el-table-column label="交接依据" align="center" prop="gist" width="100"  show-overflow-tooltip/>
       <el-table-column label="编制数量" align="center" prop="prepareNumber" />
       <el-table-column label="现有总数" align="center" prop="sum" />
       <el-table-column label="完好数量" align="center" prop="intactNumber" />

+ 1 - 1
src/views/grassrootsregistration/bdgldrill/index.vue

@@ -88,7 +88,7 @@
         align="center"
         prop="trainingCategory"
       />
-      <el-table-column label="训练地点" align="center" prop="address" />
+      <el-table-column label="训练地点" align="center" prop="address" show-overflow-tooltip/>
       <el-table-column
         label="训练时间"
         align="center"

+ 1 - 1
src/views/grassrootsregistration/bdgleven/index.vue

@@ -115,7 +115,7 @@
         </template>
       </el-table-column>
       <el-table-column label="主持人" align="center" prop="compereRen" />
-      <el-table-column label="出席人" align="center" prop="joinId" />
+      <el-table-column label="出席人" align="center" prop="joinId"  show-overflow-tooltip/>
       <!-- <el-table-column label="记录人" align="center" prop="peopleJiLu" /> -->
       <!-- <el-table-column label="会议议题" align="center" prop="title" /> -->
       <el-table-column label="召开地点" align="center" prop="address" />

+ 3 - 3
src/views/grassrootsregistration/bdglmeeting/index.vue

@@ -112,9 +112,9 @@
       </el-table-column>
       <el-table-column label="召开地点" align="center" prop="address" />
       <el-table-column label="主持人" align="center" prop="compereRen" />
-      <el-table-column label="参加人" align="center" prop="joinId" />
-      <el-table-column label="列席人" align="center" prop="peopleIds" />
-      <el-table-column label="缺席人" align="center" prop="absentIds" />
+      <el-table-column label="参加人" align="center" prop="joinId" show-overflow-tooltip/>
+      <el-table-column label="列席人" align="center" prop="peopleIds" show-overflow-tooltip/>
+      <el-table-column label="缺席人" align="center" prop="absentIds" show-overflow-tooltip/>
       <el-table-column label="记录人" align="center" prop="peopleJiLu" />
       <!-- <el-table-column
         label="会议议题"

+ 1 - 1
src/views/grassrootsregistration/bdglparty/index.vue

@@ -113,7 +113,7 @@
         </template>
       </el-table-column>
       <el-table-column label="主持人" align="center" prop="compereRen" />
-      <el-table-column label="参加人" align="center" prop="joinId" />
+      <el-table-column label="参加人" align="center" prop="joinId" show-overflow-tooltip/>
       <el-table-column label="召开地点" align="center" prop="address" />
       <el-table-column
         label="操作"

+ 3 - 3
src/views/grassrootsregistration/bdglsoldier/index.vue

@@ -108,9 +108,9 @@
       </el-table-column>
       <el-table-column label="记录人" align="center" prop="peopleJiLu" />
       <el-table-column label="主持人" align="center" prop="compereRen" />
-      <el-table-column label="列席人" align="center" prop="peopleIds" />
-      <el-table-column label="缺席人" align="center" prop="absentIds" />
-      <el-table-column label="参加人" align="center" prop="joinId" />
+      <el-table-column label="列席人" align="center" prop="peopleIds" show-overflow-tooltip/>
+      <el-table-column label="缺席人" align="center" prop="absentIds" show-overflow-tooltip/>
+      <el-table-column label="参加人" align="center" prop="joinId" show-overflow-tooltip/>
       <el-table-column label="召开地点" align="center" prop="address" />
       <el-table-column
         label="操作"

+ 566 - 0
src/views/system/diary/index.vue

@@ -0,0 +1,566 @@
+<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="setnum">
+        <el-input
+          v-model="queryParams.setnum"
+          placeholder="请输入设置是否开启"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="更新人名字" prop="upname">
+        <el-input
+          v-model="queryParams.upname"
+          placeholder="请输入更新人名字"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="更新时间" prop="updates">
+        <el-date-picker
+          clearable
+          v-model="queryParams.updates"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="请选择更新时间"
+        >
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="类别" prop="types">
+        <el-input
+          v-model="queryParams.types"
+          placeholder="请输入类别"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </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="['system:diary: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="['system:diary: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="['system:diary:remove']"
+          >删除</el-button
+        >
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['system:diary:export']"
+          >导出</el-button
+        > -->
+      <!-- </el-col> -->
+    </el-row>
+
+    <el-table
+      v-loading="loading"
+      :data="diaryList"
+      @selection-change="handleSelectionChange"
+      :header-cell-style="{ background: '#003C69', color: 'white' }"
+    >
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="序号" type="index" width="50" align="center">
+        <template scope="scope">
+          <span>{{
+            (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1
+          }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="是否开启" align="center" prop="setnum">
+        <template slot-scope="scope">
+          <span v-if="scope.row.setnum == '0'">关闭</span>
+          <span v-else>开启</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="更新人" align="center" prop="upname" />
+      <el-table-column
+        label="更新时间"
+        align="center"
+        prop="updates"
+        width="180"
+      >
+      </el-table-column>
+      <!-- <el-table-column label="类别" align="center" prop="types" /> -->
+      <el-table-column
+        label="操作"
+        align="center"
+        class-name="small-padding fixed-width"
+      >
+        <template slot-scope="scope">
+          <el-button
+            size="btu"
+            type="text"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['system:diary:edit']"
+            >修改</el-button
+          >
+          <!-- <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['system:diary: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="80px"
+        inline
+      >
+        <el-form-item label="是否开启" prop="setnum">
+          <!-- <el-input v-model="form.setnum" placeholder="请输入设置是否开启" /> -->
+          <el-radio v-model="form.setnum" :label="0">关闭</el-radio>
+          <el-radio v-model="form.setnum" :label="1">开启</el-radio>
+        </el-form-item>
+        <el-form-item label="更新人" prop="upname">
+          <el-input v-model="form.upname" placeholder="请输入更新人名字" />
+        </el-form-item>
+        <el-form-item label="更新时间" prop="updates">
+          <el-date-picker
+            clearable
+            v-model="form.updates"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="请选择更新时间"
+          >
+          </el-date-picker>
+        </el-form-item>
+        <!-- <el-form-item label="类别" prop="types">
+          <el-input v-model="form.types" placeholder="请输入类别" />
+        </el-form-item> -->
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel" size="btn">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import {
+  listDiary,
+  getDiary,
+  delDiary,
+  addDiary,
+  updateDiary,
+} from "@/api/system/diary";
+
+export default {
+  name: "Diary",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 要事日记设置 表格数据
+      diaryList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        setnum: null,
+        upname: null,
+        updates: null,
+        types: null,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {},
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询要事日记设置 列表 */
+    getList() {
+      this.loading = true;
+      listDiary(this.queryParams).then((response) => {
+        this.diaryList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        setnum: null,
+        upname: null,
+        updates: null,
+        types: 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 = "添加要事日记设置 ";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids;
+      getDiary(id).then((response) => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改要事日记设置 ";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate((valid) => {
+        if (valid) {
+          if (this.form.id != null) {
+            updateDiary(this.form).then((response) => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addDiary(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 delDiary(ids);
+        })
+        .then(() => {
+          this.getList();
+          this.$modal.msgSuccess("删除成功");
+        })
+        .catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download(
+        "system/diary/export",
+        {
+          ...this.queryParams,
+        },
+        `diary_${new Date().getTime()}.xlsx`
+      );
+    },
+  },
+};
+</script>
+
+<style scoped>
+/* 对话框背景颜色 */
+::v-deep .el-dialog {
+  background: #004d86 !important;
+}
+::v-deep .el-textarea__inner {
+  width: 700px;
+  height: 104px;
+}
+::v-deep .el-dialog__header {
+  border-bottom: 1px solid #718a9d;
+}
+::v-deep .el-dialog__title {
+  color: #fff;
+  font: 18px;
+}
+::v-deep .el-dialog__headerbtn .el-dialog__close {
+  color: #fff;
+}
+::v-deep .el-form-item__label {
+  font: 16px;
+  color: #fff;
+  width: 100px !important;
+}
+::v-deep .el-input__inner {
+  /* width: 200px !important;
+    height: 36px; */
+  background: transparent;
+  color: #fff;
+  border: 1px solid white !important;
+}
+/* 单位框背景颜色 */
+::v-deep .vue-treeselect__control {
+  background: #004d86 !important;
+}
+/* 基本信息背景 */
+.jiben {
+  width: 660px;
+  height: 32px;
+  background-image: url(../../../images/小标题底.png);
+  background-size: 100%;
+  margin-bottom: 25px;
+  color: #fff;
+  padding-left: 16px;
+  line-height: 32px;
+}
+/*调整表单间距 */
+::v-deep .el-form-item__content {
+  width: 200px;
+}
+
+.contents {
+  padding: 0px 40px !important;
+}
+/* 下拉菜单 */
+.el-dropdown-link {
+  cursor: pointer;
+  color: #409eff;
+}
+.el-icon-arrow-down {
+  font-size: 12px;
+}
+/* 刷新图标 */
+/* .el-icon-refresh {
+    width: 76px;
+    height: 36px;
+    color: #fff;
+    background-color: #1d96ff !important;
+    border-radius: 4px;
+    border: none;
+    margin-left: 20px;
+    font-size: 14px;
+  } */
+/* 下拉菜单字体/背景颜色 */
+.el-select-dropdown__item.hover,
+.el-select-dropdown__item:hover {
+  background-color: #004d86;
+  color: #fff;
+}
+.el-select-dropdown__item {
+  color: #fff;
+}
+/* 时间选择 */
+::v-deep .el-input--small .el-input__inner {
+  width: 200px;
+  height: 36px;
+  line-height: 36px;
+}
+.el-date-editor.el-input {
+  width: 200px;
+  height: 36px;
+  line-height: 36px;
+}
+::v-deep .el-date-editor.el-input .el-input__inner {
+  height: 36px;
+  line-height: 36px;
+}
+/* 单位框背景颜色 */
+::v-deep .vue-treeselect__control {
+  background: #004d86 !important;
+  color: #fff;
+}
+/* 单位下拉菜单选中字体颜色 */
+::v-deep .vue-treeselect__single-value {
+  color: #fff !important;
+}
+/* 分页按钮 */
+::v-deep .el-pagination.is-background .el-pager li {
+  background-color: #004d86;
+  color: #fff;
+}
+::v-deep .el-pagination.is-background .btn-next {
+  background-color: #004d86;
+  color: #fff;
+}
+::v-deep .el-pagination.is-background .btn-prev,
+.el-pagination.is-background .btn-next,
+.el-pagination.is-background .el-pager li {
+  background: #004d86 !important;
+  color: #fff !important;
+}
+/* 备注输入框 */
+.textareas ::v-deep .el-form-item__content {
+  width: 100%;
+}
+/* 计数器按钮 */
+::v-deep .el-input-number__increase {
+  background-color: transparent !important;
+  border: none;
+  color: #cccccc;
+  border-bottom: none !important;
+}
+::v-deep .el-input-number__decrease {
+  background-color: transparent !important;
+  border: none !important;
+  color: #cccccc;
+}
+/* 菜单权限下拉 */
+::v-deep .tree-border {
+  background: #004d86 !important;
+}
+.el-tree {
+  color: #fff !important;
+  width: 300px;
+}
+::v-deep .el-tree-node__content:hover {
+  background-color: #024274 !important;
+}
+.el-checkbox {
+  color: rgb(204, 198, 198);
+}
+/* 状态 */
+.el-radio {
+  color: rgb(204, 198, 198);
+}
+/* 日期背景颜色 */
+::v-deep .el-date-editor .el-range-input {
+  background: #00365f;
+}
+::v-deep .el-textarea__inner {
+  width: 684px;
+  height: 104px;
+}
+
+::v-deep .el-tree-node__content:hover {
+  color: #fff;
+  background-color: #024274;
+  background-repeat: no-repeat;
+}
+::v-deep
+  .el-tree--highlight-current
+  .el-tree-node.is-current
+  > .el-tree-node__content {
+  color: #fff !important;
+  background-color: #024274;
+  background-repeat: no-repeat;
+}
+::v-deep .el-tree-node__label {
+  color: #fff !important;
+}
+/* 调整输入框提示文字颜色 */
+::v-deep .vue-treeselect__placeholder {
+  color: #bdbdbd4f !important;
+}
+::v-deep input::-webkit-input-placeholder {
+  color: #bdbdbd4f !important;
+}
+::v-deep input:-moz-placeholder {
+  color: #bdbdbd4f !important;
+}
+::v-deep .el-date-editor .el-range-input {
+  color: #fff;
+}
+.el-dialog__body {
+  padding: 30px 0px 0px 27px;
+}
+::v-deep .el-dialog__footer {
+  margin-right: 109px !important;
+}
+
+::v-deep .el-dialog__body {
+  margin-left: 53px;
+}
+</style>

+ 0 - 327
src/views/system/diaryset/index.vue

@@ -1,327 +0,0 @@
-<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="${comment}" prop="setnum">
-        <el-input
-          v-model="queryParams.setnum"
-          placeholder="请输入${comment}"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="${comment}" prop="upname">
-        <el-input
-          v-model="queryParams.upname"
-          placeholder="请输入${comment}"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="${comment}" prop="update">
-        <el-date-picker clearable
-          v-model="queryParams.update"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="请选择${comment}">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="${comment}" prop="types">
-        <el-input
-          v-model="queryParams.types"
-          placeholder="请输入${comment}"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </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="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['system:diaryset:edit']"
-          >修改</el-button
-        >
-      </el-col>
-      <!-- <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['system:diaryset:add']"
-        >新增</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="['system:diaryset:remove']"
-        >删除</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['system:diaryset:export']"
-        >导出</el-button>
-      </el-col> -->
-    </el-row>
-
-    <el-table
-      v-loading="loading"
-      :data="diarysetList"
-      @selection-change="handleSelectionChange"
-      :header-cell-style="{ background: '#003C69', color: 'white' }"
-    >
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="序号" align="center" prop="id" />
-      <el-table-column label="是否开启" align="center" prop="setnum" />
-      <el-table-column label="更新人" align="center" prop="upname" />
-      <el-table-column
-        label="更新时间"
-        align="center"
-        prop="update"
-        width="180"
-      >
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.update, "{y}-{m}-{d}") }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="类别" align="center" prop="types" />
-      <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="['system:diaryset:edit']"
-            >修改</el-button
-          >
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['system:diaryset: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="80px">
-        <el-form-item label="${comment}" prop="setnum">
-          <el-input v-model="form.setnum" placeholder="请输入${comment}" />
-        </el-form-item>
-        <el-form-item label="${comment}" prop="upname">
-          <el-input v-model="form.upname" placeholder="请输入${comment}" />
-        </el-form-item>
-        <el-form-item label="${comment}" prop="update">
-          <el-date-picker
-            clearable
-            v-model="form.update"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="请选择${comment}"
-          >
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="${comment}" prop="types">
-          <el-input v-model="form.types" placeholder="请输入${comment}" />
-        </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 {
-  listDiaryset,
-  getDiaryset,
-  delDiaryset,
-  addDiaryset,
-  updateDiaryset,
-} from "@/api/system/diaryset";
-
-export default {
-  name: "Diaryset",
-  data() {
-    return {
-      // 遮罩层
-      loading: false,
-      // 选中数组
-      ids: [],
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
-      // 显示搜索条件
-      showSearch: true,
-      // 总条数
-      total: 0,
-      // 要事日记设置表格数据
-      diarysetList: [],
-      // 弹出层标题
-      title: "",
-      // 是否显示弹出层
-      open: false,
-      // 查询参数
-      queryParams: {
-        pageNum: 1,
-        pageSize: 10,
-        setnum: null,
-        upname: null,
-        update: null,
-        types: null,
-      },
-      // 表单参数
-      form: {},
-      // 表单校验
-      rules: {},
-    };
-  },
-  created() {
-    this.getList();
-  },
-  methods: {
-    /** 查询要事日记设置列表 */
-    getList() {
-      this.loading = true;
-      listDiaryset(this.queryParams).then((response) => {
-        this.diarysetList = response.rows;
-        this.total = response.total;
-        this.loading = false;
-      });
-    },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        id: null,
-        setnum: null,
-        upname: null,
-        update: null,
-        types: 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 = "添加要事日记设置";
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.reset();
-      const id = row.id || this.ids;
-      getDiaryset(id).then((response) => {
-        this.form = response.data;
-        this.open = true;
-        this.title = "修改要事日记设置";
-      });
-    },
-    /** 提交按钮 */
-    submitForm() {
-      this.$refs["form"].validate((valid) => {
-        if (valid) {
-          if (this.form.id != null) {
-            updateDiaryset(this.form).then((response) => {
-              this.$modal.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            });
-          } else {
-            addDiaryset(this.form).then((response) => {
-              this.$modal.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-            });
-          }
-        }
-      });
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const ids = row.id || this.ids;
-      this.$modal
-        .confirm('是否确认删当前的数据项?')
-        .then(function () {
-          return delDiaryset(ids);
-        })
-        .then(() => {
-          this.getList();
-          this.$modal.msgSuccess("删除成功");
-        })
-        .catch(() => {});
-    },
-    /** 导出按钮操作 */
-    handleExport() {
-      this.download(
-        "system/diaryset/export",
-        {
-          ...this.queryParams,
-        },
-        `diaryset_${new Date().getTime()}.xlsx`
-      );
-    },
-  },
-};
-</script>

+ 6 - 7
src/views/taishi/index.vue

@@ -961,9 +961,9 @@
                   <img src=".././../assets/images/打印icon.png" alt />
                 </div>
                 <div class="right3-r-main-item-r">
-                  <div class="s1">本周打印数量</div>
+                  <div class="s1">本周打印</div>
                   <div class="s2">
-                    <b style="color: #30fdff">{{ wylist.total }}</b
+                    <b style="color: #30fdff">{{ wylist.total || 0 }}</b
                     >份
                   </div>
                 </div>
@@ -975,7 +975,7 @@
                 <div class="right3-r-main-item-r">
                   <div class="s1">归还数量</div>
                   <div class="s2">
-                    <b style="color: #2bf1b2">{{wylist.returnNumber }}</b
+                    <b style="color: #2bf1b2">{{ wylist.returnNumber || 0 }}</b
                     >份
                   </div>
                 </div>
@@ -988,7 +988,7 @@
                   <div class="s1">未归还数量</div>
                   <div class="s2">
                     <b style="color: #ff5a5a">{{
-                      wylist.weiReturnNumber
+                      wylist.weiReturnNumber || 0
                     }}</b
                     >份
                   </div>
@@ -999,10 +999,10 @@
                   <img src=".././../assets/images/归还4.png" alt />
                 </div>
                 <div class="right3-r-main-item-r">
-                  <div class="s1">无需归还数量</div>
+                  <div class="s1">无需归还</div>
                   <div class="s2">
                     <b style="color: #738c97">{{
-                      wylist.noReturnNumber
+                      wylist.noReturnNumber || 0
                     }}</b
                     >份
                   </div>
@@ -1244,7 +1244,6 @@ export default {
     //集中文印
     rizongwenyin().then((res) => {
       this.wylist = res.data;
-      console.log(res.data);
       // if (this.wylist[1]) {
       // } else {
       //   this.wylist[1] = 0;