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

lzhe

2024-04-07 711854c3ee1f63bbc0e12ccdc114f2ebd53d8c28

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

 package.json

@@ -9,6 +9,7 @@
    },
    "dependencies": {
        "@element-plus/icons-vue": "2.0.10",
        "@popperjs/core": "npm:@sxzz/popperjs-es@^2.11.7",
        "@tinymce/tinymce-vue": "5.0.0",
        "axios": "1.3.4",
        "codemirror": "5.65.5",
@@ -23,6 +24,7 @@
        "qs": "6.7.0",
        "sortablejs": "1.15.0",
        "tinymce": "6.3.2",
        "v-calendar": "^3.1.2",
        "vue": "3.2.47",
        "vue-i18n": "9.2.2",
        "vue-router": "4.1.6",

 src/main.js

@@ -1,8 +1,8 @@
/*
 * @Date: 2024-03-23 09:49:06
 * @LastEditors: gaoshp
 * @LastEditTime: 2024-03-26 21:40:32
 * @FilePath: /cps-web/src/main.js
 * @LastEditors: Sneed
 * @LastEditTime: 2024-04-06 14:34:14
 * @FilePath: /belleson-frontend/Users/mache/Documents/demo/cps-web/src/main.js
 */
import { createApp } from 'vue'
import ElementPlus from 'element-plus'
@@ -13,9 +13,11 @@
import router from './router'
import store from './store'
import App from './App.vue'
import { setupCalendar } from 'v-calendar';

const app = createApp(App);

app.use(setupCalendar, {})
app.use(store);
app.use(router);
app.use(ElementPlus);

 src/views/console/base/CalenderTab.vue

@@ -1,7 +1,7 @@
<!--
 * @Date: 2024-04-04 22:45:43
 * @LastEditors: Sneed
 * @LastEditTime: 2024-04-06 14:30:47
 * @LastEditTime: 2024-04-06 15:05:06
 * @FilePath: /belleson-frontend/Users/mache/Documents/demo/cps-web/src/views/console/base/CalenderTab.vue
-->
<template>
@@ -15,15 +15,34 @@
                        <p>应用年份: {{item.year}}</p>
                    </el-card>
                </div>

            </el-aside>
            <el-container>
                <el-header>
                    <el-button type="primary">关联工位</el-button>
                    <el-button type="primary">编辑日历</el-button>
                    <el-button type="primary">删除</el-button>
                </el-header>
                <el-main>
                    <Calendar disable-page-swipe :nav-visibility="''" :attributes='attributes'/>
                </el-main>
            </el-container>
        </el-container>
</template>

<script>
import { Calendar, DatePicker } from 'v-calendar';
import 'v-calendar/style.css';

export default {
    components: {
        Calendar,
        DatePicker
    },
    data() {
        return {
            attributes: [
                
            ],
            current: 0,
            total: 1,
            caleList: []