فهرست منبع

修改部分代码

尹帮元 2 سال پیش
والد
کامیت
8f64b0c64d
5فایلهای تغییر یافته به همراه73 افزوده شده و 22 حذف شده
  1. 1 1
      src/assets/styles/variables.scss
  2. 11 1
      src/main.js
  3. 5 1
      src/utils/ruoyi.js
  4. 37 4
      src/views/system/workTimeSet/api.js
  5. 19 15
      src/views/system/workTimeSet/workTime.vue

+ 1 - 1
src/assets/styles/variables.scss

@@ -11,7 +11,7 @@ $panGreen: #30B08F;
 // 默认菜单主题风格
 $base-menu-color:#bfcbd9;
 $base-menu-color-active:#f4f4f5;
-$base-menu-background:#f1f1f1;
+$base-menu-background:#f0f2f5;
 $base-logo-title-color: #ffffff;
 
 $base-menu-light-color:rgba(0,0,0,.70);

+ 11 - 1
src/main.js

@@ -13,7 +13,15 @@ import './assets/icons' // icon
 import './permission' // permission control
 import { getDicts } from "@/api/system/dict/data";
 import { getConfigKey } from "@/api/system/config";
-import { parseTime, resetForm, addDateRange, selectDictLabel, selectDictLabels, handleTree } from "@/utils/ruoyi";
+import {
+  parseTime,
+  resetForm,
+  addDateRange,
+  selectDictLabel,
+  selectDictLabels,
+  handleTree,
+  formatTime
+} from "@/utils/ruoyi";
 // 分页组件
 import Pagination from "@/components/Pagination";
 // 自定义表格工具组件
@@ -39,6 +47,8 @@ Vue.prototype.getDicts = getDicts
 Vue.prototype.getConfigKey = getConfigKey
 //格式化时间
 Vue.prototype.parseTime = parseTime
+//格式化时间
+Vue.prototype.formatTime = formatTime
 //重置表单
 Vue.prototype.resetForm = resetForm
 //添加日期范围

+ 5 - 1
src/utils/ruoyi.js

@@ -19,7 +19,7 @@ export function timeCheck(srcs) {
   return true;
 }
 
-// 日期格式化
+// 日期格式化 2023-12-30 00:00:00
 export function parseTime(value, format = "YYYY-MM-DD HH:mm:ss") {
   if ((value + "").length == 10) {
     value *= 1000;
@@ -27,6 +27,10 @@ export function parseTime(value, format = "YYYY-MM-DD HH:mm:ss") {
   return value && dayjs(value).format(format);
 }
 
+export function formatTime(value, format = "YYYY-MM-DD HH:mm:ss") {
+  return value && dayjs(value).format(format);
+}
+
 // 表单重置
 export function resetForm(refName) {
   if (this.$refs[refName]) {

+ 37 - 4
src/views/system/workTimeSet/api.js

@@ -1,11 +1,44 @@
 import request from '@/utils/request'
 
-// 获取树结构
-export function treeData(data) {
+
+// 获取table数据
+export function tableList(params) {
+  return request({
+    url: '/system/work/time/pageList',
+    method: 'get',
+    showLoading:false,
+    params
+  })
+}
+
+
+// 修改作息信息
+export function editWorkTime(data) {
+  return request({
+    url: '/system/work/time/saveOneWorkTime',
+    method: 'post',
+    showLoading:false,
+    data
+  })
+}
+
+
+// 按周配置作息
+export function editTimeWeek(data) {
+  return request({
+    url: '/system/work/time/saveOneWorkTime',
+    method: 'post',
+    showLoading:false,
+    data
+  })
+}
+
+// 指定日期作息配置
+export function addWorkTimeDay(data) {
   return request({
-    url: '/appRule/group',
+    url: '/system/work/time/saveOneWorkTime',
     method: 'post',
-    showLoading:true,
+    showLoading:false,
     data
   })
 }

+ 19 - 15
src/views/system/workTimeSet/workTime.vue

@@ -145,18 +145,19 @@
 </template>
 
 <script>
-import tableList  from '@/mixins/tableList'
+import tableListMixins  from '@/mixins/tableList'
 import DialogEdit from './dialog.edit'
 import DialogAdd from './dialog.add'
 import {json} from'./json'
 /** 引入节点树接口*/
 import { deptTreeSelect } from "@/api/system/public";
+import { tableList } from "./api";
 
 export default {
   /**  得先引入字典才能使用 */
   dicts: ['sys_business_type'],
   /** 引入基础minxins*/
-  mixins:[tableList],
+  mixins:[tableListMixins],
   components: {DialogEdit,DialogAdd},
   data() {
     //初始化查询日期
@@ -229,19 +230,22 @@ export default {
     /** 查询列表 */
     getList(id) {
       //this.loading = true;
-      console.log(this.queryParams,111);
-      console.log(this.addDateRange(this.queryParams, this.dateRange),2222);
-      this.tableList = json.content;
-      //  tableList(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
-      //     //兼容框架userId字段
-      //     response.rows.forEach(v=>{v.userId = v.id});
-      //     this.userList = response.rows;
-      //     this.total = response.total;
-      //     this.loading = false;
-      //   }
-      // ).catch(err=>{
-      //   this.loading = false;
-      // })
+      //console.log(this.queryParams,111);
+      //console.log(this.addDateRange(this.queryParams, this.dateRange),2222);
+      //this.tableList = json.content;
+      this.addDateRange(this.queryParams, this.dateRange)
+      let data = this.queryParams;
+      data.range
+      tableList().then(response => {
+          //兼容框架userId字段
+          response.rows.forEach(v=>{v.userId = v.id});
+          this.userList = response.rows;
+          this.total = response.total;
+          this.loading = false;
+        }
+      ).catch(err=>{
+        this.loading = false;
+      })
     },
     /** 查询机构树 */
     getDeptTree() {