Merge branch 'master' of http://www.beijingsoft.cn:9090/r/smart-web

lzhe

2024-04-09 2f6c586a39c1480153ac092b75461175aaa87481

Merge branch 'master' of http://www.beijingsoft.cn:9090/r/smart-web

 dist.zip

Binary files differ

 public/img/initiallong.b9495273.png

 src/api/model/calender.js

@@ -1,7 +1,7 @@
/*
 * @Date: 2024-04-04 23:26:03
 * @LastEditors: Sneed
 * @LastEditTime: 2024-04-04 23:33:51
 * @LastEditTime: 2024-04-09 20:39:23
 * @FilePath: /belleson-frontend/Users/mache/Documents/demo/cps-web/src/api/model/calender.js
 */
import config from "@/config"
@@ -15,4 +15,18 @@
            return await http.post(this.url, data, {params});
        },
    },
    getShiftsystemList: {
        url: `${config.API_URL}/blade-cps/shift/page`,
        name: "获取班制列表",
        post: async function({data,params}){
            return await http.post(this.url, {},{data, params});
        },
    },
    getShiftsystemInfo: {
        url: `${config.API_URL}/blade-cps/shift/`,
        name: "获取班制信息",
        get: async function({id}){
            return await http.get(`${this.url}${id}`, {},{});
        },
    },
}

 src/api/model/time.js

@@ -1,8 +1,8 @@
/*
 * @Date: 2024-04-07 21:49:32
 * @LastEditors: gaoshp
 * @LastEditTime: 2024-04-08 14:58:49
 * @FilePath: /cps-web/src/api/model/time.js
 * @LastEditors: Sneed
 * @LastEditTime: 2024-04-09 20:25:53
 * @FilePath: /belleson-frontend/Users/mache/Documents/demo/cps-web/src/api/model/time.js
 */
import config from "@/config"
import http from "@/utils/request"
@@ -42,5 +42,4 @@
        },
        
    },

}

 src/layout/index.vue

@@ -99,7 +99,7 @@
                <div class="logo-bar personalized-logo">
                    <!-- <img class="logo" src="img/logo.png">
                    <span>{{ $CONFIG.APP_NAME }}</span> -->
                    <img src="/img/initiallong.b9495273.png" class="img" style="width: 100%; height: 100%;">
                    <img src="/img/initiallong.b9495273.png" class="img" style="width: 100%; height: 70%;">
                </div>
            </div>
            <div class="adminui-header-right">

 src/views/console/base/CalenderTab.vue

@@ -1,7 +1,7 @@
<!--
 * @Date: 2024-04-04 22:45:43
 * @LastEditors: Sneed
 * @LastEditTime: 2024-04-07 20:31:00
 * @LastEditTime: 2024-04-09 20:15:57
 * @FilePath: /belleson-frontend/Users/mache/Documents/demo/cps-web/src/views/console/base/CalenderTab.vue
-->
<template>
@@ -23,7 +23,7 @@
                    <el-button type="primary">删除</el-button>
                </el-header>
                <el-main>
                    <Calendar :rows="12" disable-page-swipe :nav-visibility="''" :attributes='attributes'/>
                    <Calendar :min-date="minDate" :rows="1" disable-page-swipe :nav-visibility="''" :attributes='attributes'/>
                </el-main>
            </el-container>
        </el-container>
@@ -45,13 +45,20 @@
            ],
            current: 0,
            total: 1,
            caleList: []
            caleList: [],
            minDate: '',
            maxDate: ''
        }
    },
    created() {
        this.load()
        this.init()
    },
    methods: {
        init () {
            this.minDate = new Date('2024-01-01')
            this.maxDate = new Date('2024-01-31')
        },
        load() {
            if  (this.current * 15 >= this.total) {
                return

 src/views/console/base/Shiftsystem.vue

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,48 @@
<!--
 * @Date: 2024-04-09 20:19:46
 * @LastEditors: Sneed
 * @LastEditTime: 2024-04-09 20:38:18
 * @FilePath: /belleson-frontend/Users/mache/Documents/demo/cps-web/src/views/console/base/Shiftsystem.vue
-->
<template>
    <el-container>
        <el-aside width="320px">
            <el-table :data="tableData" stripe style="width: 100%" @row-click="rowClick">
                <el-table-column prop="code" label="班制编号" />
                <el-table-column prop="name" label="班制名称" />
            </el-table>
        </el-aside>
        <el-container>
            456
        </el-container>
    </el-container>
</template>

<script>
export default {
    data () {
        return {
            tableData: []
        }
    },
    created () {
        this.$API.calender.getShiftsystemList.post({params: {current:1,size: 15},data: {
            code: "",name: "",statusList: [1]
        }}).then(res => {
            this.tableData = res?.data?.records || []
            let current = this.tableData?.[0] || ''
            current.id && this.rowClick(current)
        })
    },
    methods: {
        rowClick(row) {
            console.log(row)
            this.$API.calender.getShiftsystemInfo.get({id: row.id}).then(res => {
                console.log(res.data)
            })
        }
    },
}
</script>

<style lang="scss" scoped></style>

 src/views/console/base/shift-calendar.vue

@@ -1,7 +1,7 @@
<!--
 * @Date: 2024-04-04 21:51:24
 * @LastEditors: Sneed
 * @LastEditTime: 2024-04-05 00:15:20
 * @LastEditTime: 2024-04-09 20:19:15
 * @FilePath: /belleson-frontend/Users/mache/Documents/demo/cps-web/src/views/console/base/shift-calendar.vue
-->
<template>
@@ -10,15 +10,19 @@
                <el-tab-pane label="生产日历" name="1">
                    <CalenderTab></CalenderTab>
                </el-tab-pane>
                <el-tab-pane label="班制" name="2"></el-tab-pane>
                <el-tab-pane label="班制" name="2">
                    <ShiftsystemVue></ShiftsystemVue>
                </el-tab-pane>
            </el-tabs>
    </el-main>
</template>
<script>
    import CalenderTab from './CalenderTab.vue';
import ShiftsystemVue from './Shiftsystem.vue';
    export default {
        components: {
            CalenderTab
            CalenderTab,
            ShiftsystemVue
        },
        data () {
            return {