update

gaosp

2024-01-23 ecf9ed1fe8067b6e6703f0981796d84643471111

update

 package-lock.json

@@ -10,6 +10,7 @@
      "license": "MIT",
      "dependencies": {
        "axios": "0.17.1",
        "dayjs": "^1.11.10",
        "element-ui": "^2.15.14",
        "expres": "0.0.5",
        "glob": "^7.1.6",
@@ -2241,6 +2242,7 @@
      "dependencies": {
        "anymatch": "~3.1.2",
        "braces": "~3.0.2",
        "fsevents": "~2.3.2",
        "glob-parent": "~5.1.2",
        "is-binary-path": "~2.1.0",
        "is-glob": "~4.0.1",
@@ -3465,6 +3467,11 @@
      "engines": {
        "node": ">=0.10"
      }
    },
    "node_modules/dayjs": {
      "version": "1.11.10",
      "resolved": "https://registry.npmmirror.com/dayjs/-/dayjs-1.11.10.tgz",
      "integrity": "sha512-vjAczensTgRcqDERK0SR2XMwsF/tSvnvlv6VcF2GIhg6Sx4yOIt/irsr1RDJsKiIyBzJDpCoXiWWq28MqH2cnQ=="
    },
    "node_modules/de-indent": {
      "version": "1.0.2",
@@ -15442,8 +15449,10 @@
      "integrity": "sha512-9P3MWk6SrKjHsGkLT2KHXdQ/9SNkyoJbabxnKOoJepsvJjJG8uYTR3yTPxPQvNDI3w4Nz1xnE0TLHK4RIVe/MQ==",
      "dev": true,
      "dependencies": {
        "chokidar": "^3.4.1",
        "graceful-fs": "^4.1.2",
        "neo-async": "^2.5.0"
        "neo-async": "^2.5.0",
        "watchpack-chokidar2": "^2.0.1"
      },
      "optionalDependencies": {
        "chokidar": "^3.4.1",
@@ -15505,6 +15514,7 @@
        "anymatch": "^2.0.0",
        "async-each": "^1.0.1",
        "braces": "^2.3.2",
        "fsevents": "^1.2.7",
        "glob-parent": "^3.1.0",
        "inherits": "^2.0.3",
        "is-binary-path": "^1.0.0",
@@ -15934,6 +15944,7 @@
      "dependencies": {
        "anymatch": "^1.3.0",
        "async-each": "^1.0.0",
        "fsevents": "^1.0.0",
        "glob-parent": "^2.0.0",
        "inherits": "^2.0.1",
        "is-binary-path": "^1.0.0",
@@ -16610,6 +16621,7 @@
      "dev": true,
      "dependencies": {
        "source-map": "~0.5.1",
        "uglify-to-browserify": "~1.0.0",
        "yargs": "~3.10.0"
      },
      "bin": {
@@ -19994,6 +20006,11 @@
        "assert-plus": "^1.0.0"
      }
    },
    "dayjs": {
      "version": "1.11.10",
      "resolved": "https://registry.npmmirror.com/dayjs/-/dayjs-1.11.10.tgz",
      "integrity": "sha512-vjAczensTgRcqDERK0SR2XMwsF/tSvnvlv6VcF2GIhg6Sx4yOIt/irsr1RDJsKiIyBzJDpCoXiWWq28MqH2cnQ=="
    },
    "de-indent": {
      "version": "1.0.2",
      "resolved": "https://registry.npmjs.org/de-indent/-/de-indent-1.0.2.tgz",

 package.json

@@ -14,6 +14,7 @@
  },
  "dependencies": {
    "axios": "0.17.1",
    "dayjs": "^1.11.10",
    "element-ui": "^2.15.14",
    "expres": "0.0.5",
    "glob": "^7.1.6",

 src/assets/DS-Digital.ttf

Binary files differ

 src/assets/img/table-del.png

 src/assets/img/table-edit.png

 src/components/home/index.vue

@@ -1,8 +1,8 @@
<!--
 * @Date: 2024-01-04 19:40:32
 * @LastEditors: Sneed
 * @LastEditTime: 2024-01-04 20:45:45
 * @FilePath: /belleson-frontend/Users/mache/Library/Containers/com.tencent.xinWeChat/Data/Library/Application Support/com.tencent.xinWeChat/2.0b4.0.9/650b28d71b3acf9feb5c2af6da2686eb/Message/MessageTemp/650b28d71b3acf9feb5c2af6da2686eb/File/mdc-portal/src/components/home/index.vue
 * @LastEditTime: 2024-01-23 18:38:18
 * @FilePath: /belleson-frontend/Users/mache/Documents/demo/mdc/src/components/home/index.vue
-->
<template>
    <div class="home">
@@ -11,7 +11,7 @@
            <div class="menu">
              <slot name="menu"></slot>
            </div>
            
            <p class="time">{{time1}}<span>{{time2}}</span></p>
        </div>
        <div class="content">
            <slot name="content"></slot>
@@ -21,7 +21,24 @@
    </div>
</template>
<script>
import dayjs from 'dayjs'
let timer
export default {
    data () {
      return {
        time1: '',
        time2: ''
      }
    },
    created () {
      timer = setInterval(() => {
        this.time1 = dayjs().format('YYYY/MM/DD')
        this.time2 = dayjs().format('HH:mm:ss')
      },1000)
    },
    beforeDestroy() {
      clearInterval(timer)
    },
    mounted () {
        console.log(this, '------')
    }
@@ -40,6 +57,7 @@
  display: flex;
  flex-direction: column;
  .header {
    position: relative;
    padding-left: 24px;
    padding-right: 24px;
    height: 94px;
@@ -59,6 +77,16 @@
      height: 50px;
      margin-left: auto;
    }
    .time {
      // position: absolute;
      color: #fff;
      font-size: 20px;
      span {
        margin-left: 14px;
        font-family: digital;
        font-size: 30px;
      }
    }
  }
  .content {
    flex: 1 1 auto;

 src/container/Map/Map.vue

@@ -1,7 +1,7 @@
<!--
 * @Date: 2024-01-05 23:47:53
 * @LastEditors: Sneed
 * @LastEditTime: 2024-01-20 19:40:37
 * @LastEditTime: 2024-01-23 19:20:24
 * @FilePath: /belleson-frontend/Users/mache/Documents/demo/mdc/src/container/Map/Map.vue
-->
<template>
@@ -22,7 +22,7 @@
                <el-input style="width: 70px;" class="input"  v-model="plantName" placeholder="请输入厂名" />
            </div>
            <div class="table" :class="$route.name === 'preview' ? 'active' : ''">
                <div class="table-action" :style="position" v-show="showAction && status !== 2">
                <div class="table-actions" :style="position" v-show="showAction && status !== 2">
                    <div @click="merge">合并</div>
                    <div @click="split">拆分</div>
                    <div @click="sign(1)">过道</div>
@@ -534,7 +534,7 @@
    position: relative;
    overflow-x: scroll;

    .table-action {
    .table-actions {
        position: fixed;
        z-index: 999;
        color: #fff;

 src/container/component/index.vue

@@ -1,7 +1,7 @@
<!--
 * @Date: 2024-01-06 17:40:19
 * @LastEditors: Sneed
 * @LastEditTime: 2024-01-16 23:04:06
 * @LastEditTime: 2024-01-23 19:14:03
 * @FilePath: /belleson-frontend/Users/mache/Documents/demo/mdc/src/container/component/index.vue
-->
<template>
@@ -58,8 +58,8 @@
                    </el-date-picker>
                </div>
                <div class="item" style="flex: 1 1 auto;justify-content: flex-end;">
                    <el-button type="primary" size="small" @click="query">查询</el-button>
                    <el-button type="primary" size="small" @click="reset">重置</el-button>
                    <el-button type="primary" size="small" style="width: 150px" @click="query">查询</el-button>
                    <el-button type="ghost" size="small" style="width: 150px" @click="reset">重置</el-button>
                </div>
            </template>
            <template slot="columns">
@@ -145,12 +145,6 @@
            border-radius: 2px;
            border: 1px solid #435F9E;
        }
    }
    .el-button--mini {
        background: transparent;
    }
    .el-button--primary {
        background-color: transparent;
    }
}
</style>

 src/container/deviceType/index.vue

@@ -1,7 +1,7 @@
<!--
 * @Date: 2024-01-06 17:40:19
 * @LastEditors: Sneed
 * @LastEditTime: 2024-01-20 17:14:54
 * @LastEditTime: 2024-01-23 19:19:35
 * @FilePath: /belleson-frontend/Users/mache/Documents/demo/mdc/src/container/deviceType/index.vue
-->
<template>
@@ -15,13 +15,13 @@
                    
                </div>
                <div class="item" style="flex: 1 1 auto;justify-content: flex-end;">
                    <el-button type="primary" size="small" @click="query">查询</el-button>
                    <el-button type="primary" size="small" @click="reset">重置</el-button>
                    <el-button type="primary" size="small" style="width: 150px;" @click="query">查询</el-button>
                    <el-button type="ghost" size="small" style="width: 150px;" @click="reset">重置</el-button>
                </div>
            </template>
            
            <template slot="table-tool">
                <el-button type="primary" size="mini" @click="add">添加设备类型</el-button>
                <el-button type="primary" size="mini" style="width: 150px;" @click="add">添加设备类型</el-button>
            </template>
            
            <template slot="columns">
@@ -35,10 +35,12 @@
                    label="名称"
                    >
                </el-table-column>
                 <el-table-column width="180" align="center" label="操作" prop="editor">
                 <el-table-column width="220" align="center" label="操作" prop="editor">
                    <template slot-scope="scope">
                        <el-button size="mini" type="text" @click="editDeviceType(scope.row)">编辑</el-button>
                        <el-button size="mini" type="text" @click="deleteHandle(scope.row)">删除</el-button>
                        <a class="table-action table-edit" @click="editDeviceType(scope.row)">编辑</a>
                        <a class="table-action table-del" @click="deleteHandle(scope.row)">删除</a>
                        <!-- <el-button size="mini" type="text" @click="editDeviceType(scope.row)">编辑</el-button>
                        <el-button size="mini" type="text" @click="deleteHandle(scope.row)">删除</el-button> -->
                    </template>
                </el-table-column>
            </template>
@@ -140,11 +142,13 @@
            border: 1px solid #435F9E;
        }
    }
    .el-button--mini {
        background: transparent;
    .el-button {
        background: #AAB6BA;
        color: #90999C;
    }
    .el-button--primary {
        background-color: transparent;
        color: #FFF;
        background: #5DD1FC;
    }
}
</style>

 src/container/ledger/Manage-add-update.vue

@@ -217,14 +217,15 @@
                    </el-col>

                    <el-col :xs="24" :sm="6" :md="6" :lg="6" :xl="6">

                        <el-form-item label="备注" prop="remark">

                            <el-input v-model="dataForm.remark" placeholder="备注" clearable></el-input>

                            <el-input type="textarea"

  :rows="2" v-model="dataForm.remark" placeholder="备注" clearable></el-input>

                        </el-form-item>

                    </el-col>

                </el-row>

                <!-- 上传 -->

                <el-row :gutter="20">

                    <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">

                        <el-form-item label="上传图片" prop="pic">

                        <el-form-item label="上传设备图片" prop="pic">

                            <el-upload class="avatar-uploader" action="/mdc/account/uploadPic" :show-file-list="false"

                                :on-success="handleAvatarSuccess" :before-upload="beforeAvatarUpload">

                                <img v-if="dataForm.pic" :src="dataForm.pic" class="avatar">


 src/container/ledger/index.vue

@@ -1,7 +1,7 @@
<!--
 * @Date: 2024-01-06 17:40:19
 * @LastEditors: Sneed
 * @LastEditTime: 2024-01-18 23:33:58
 * @LastEditTime: 2024-01-23 19:19:40
 * @FilePath: /belleson-frontend/Users/mache/Documents/demo/mdc/src/container/ledger/index.vue
-->
<template>
@@ -69,9 +69,8 @@
                    </el-select>
                </div>
                <div class="item" style="flex: 1 1 auto;justify-content: flex-end;">
                    <el-button type="primary" size="small" @click="query">查询</el-button>
                    <el-button type="primary" size="small" @click="reset">重置</el-button>
                    <!-- <div class="reset btn"  @click="reset">重置</div> -->
                    <el-button type="primary" style="width: 150px;" size="small" @click="query">查询</el-button>
                    <el-button type="ghost" style="width: 150px;" size="small" @click="reset">重置</el-button>
                </div>
                
            </template>
@@ -132,10 +131,12 @@
                </el-table-column>
                <el-table-column label="备注" align="center" prop="remark">
                </el-table-column>
                <el-table-column fixed="right" align="center" label="操作">
                <el-table-column width="220" fixed="right" align="center" label="操作">
                    <template slot-scope="scope">
                        <el-button type="text" size="small" @click="addOrUpdateHandle(scope.row)">编辑</el-button>
                        <el-button type="text" size="small" @click="del(scope.row)">删除</el-button>
                        <a class="table-action table-edit"  @click="addOrUpdateHandle(scope.row)">编辑</a>
                        <a class="table-action table-del"  @click="del(scope.row)">删除</a>
                        <!-- <el-button type="text" size="small" @click="addOrUpdateHandle(scope.row)">编辑</el-button>
                        <el-button type="text" size="small" @click="del(scope.row)">删除</el-button> -->
                    </template>
                </el-table-column>
            </template>
@@ -286,12 +287,13 @@
        }
    }

    .el-button--mini {
        background: transparent;
    .el-button {
        background: #AAB6BA;
        color: #90999C;
    }

    .el-button--primary {
        background-color: transparent;
        color: #FFF;
        background: #5DD1FC;
    }
}
</style>

 src/container/list/index.vue

@@ -1,7 +1,7 @@
<!--
 * @Date: 2024-01-06 17:40:19
 * @LastEditors: Sneed
 * @LastEditTime: 2024-01-18 23:55:56
 * @LastEditTime: 2024-01-23 19:04:07
 * @FilePath: /belleson-frontend/Users/mache/Documents/demo/mdc/src/container/list/index.vue
-->
<template>
@@ -88,6 +88,12 @@
        height: 100%;
        overflow: auto;
        .table {
            .hover-row {
                background-color: transparent;
                td.el-table__cell {
                    background-color: transparent;
                }
            }
            .el-table::before {
                background-color: transparent;
            }

 src/container/machineList/index.vue

@@ -1,7 +1,7 @@
<!--
 * @Date: 2024-01-06 17:40:19
 * @LastEditors: Sneed
 * @LastEditTime: 2024-01-21 22:24:19
 * @LastEditTime: 2024-01-23 19:19:45
 * @FilePath: /belleson-frontend/Users/mache/Documents/demo/mdc/src/container/machineList/index.vue
-->
<template>
@@ -36,8 +36,8 @@
                    </el-select>
                </div>
                <div class="item" style="flex: 1 1 auto;justify-content: flex-end;">
                    <el-button type="primary" size="small" @click="query">查询</el-button>
                    <el-button type="primary" size="small" @click="reset">重置</el-button>
                    <el-button type="primary" size="small" style="width: 150px" @click="query">查询</el-button>
                    <el-button type="ghost" size="small" style="width: 150px" @click="reset">重置</el-button>
                </div>
            </template>
            <!--
@@ -107,9 +107,10 @@
                    label="DNC名称"
                    width="180">
                </el-table-column>
                <el-table-column fixed="right" align="center" label="操作">
                <el-table-column width="120px" fixed="right" align="center" label="操作">
                    <template slot-scope="scope">
                        <el-button type="text" size="small" @click="handlerSetting(scope.row)">配置</el-button>
                        <a class="table-action table-edit" @click="handlerSetting(scope.row)">配置</a>
                        <!-- <el-button type="text" size="small" @click="handlerSetting(scope.row)">配置</el-button> -->
                    </template>
                </el-table-column>
            </template>
@@ -215,12 +216,6 @@
            border-radius: 2px;
            border: 1px solid #435F9E;
        }
    }
    .el-button--mini {
        background: transparent;
    }
    .el-button--primary {
        background-color: transparent;
    }
}
</style>

 src/container/maintenance/dailyMAdd.vue

@@ -7,7 +7,7 @@
            <el-row :gutter="24">

                <el-col :xs="24" :sm="6" :md="6" :lg="6" :xl="6">

                    <el-form-item label="设备名称" prop="machineName">

                        <el-select v-model="dataForm.machineId" placeholder="---请选择---" clearable>

                        <el-select filterable v-model="dataForm.machineId" placeholder="---请选择---" clearable>

                            <el-option v-for="item in machineList" :key="item.id" :label="item.machineName"

                                :value="item.id">

                            </el-option>


 src/container/maintenance/index.vue

@@ -1,7 +1,7 @@
<!--
 * @Date: 2024-01-06 17:40:19
 * @LastEditors: Sneed
 * @LastEditTime: 2024-01-19 00:15:38
 * @LastEditTime: 2024-01-23 19:16:16
 * @FilePath: /belleson-frontend/Users/mache/Documents/demo/mdc/src/container/maintenance/index.vue
-->
<template>
@@ -50,12 +50,12 @@
                    </el-date-picker>
                </div>
                <div class="item"  style="flex: 1 1 auto;justify-content: flex-end;">
                    <el-button type="primary" size="small" @click="query">查询</el-button>
                    <el-button type="primary" size="small" @click="reset">重置</el-button>
                    <el-button type="primary" style="width: 150px;" size="small" @click="query">查询</el-button>
                    <el-button type="ghost" style="width: 150px;" size="small" @click="reset">重置</el-button>
                </div>
            </template>
            <template slot="table-tool">
                <el-button type="primary" size="mini" @click="addDevice(1)">添加</el-button>
                <el-button type="primary" size="mini" style="width: 150px;" @click="addDevice(1)">添加</el-button>
            </template>
            <template slot="columns">
                <!-- <el-table-column
@@ -103,10 +103,12 @@
                </el-table-column>
                <el-table-column align="center" width="150" :show-overflow-tooltip="true" label="保养内容与存在问题" prop="detail">
                </el-table-column>
                <el-table-column align="center" label="操作" prop="editor">
                <el-table-column width="220" align="center" label="操作" prop="editor">
                    <template slot-scope="scope">
                        <el-button size="mini" type="text" @click="addDevice(2, scope.row, $event)">编辑</el-button>
                        <el-button size="mini" type="text" @click="deleteHandle(scope.row)">删除</el-button>
                        <a class="table-action" @click="addDevice(2, scope.row, $event)">编辑</a>
                        <a class="table-action table-del" @click="deleteHandle(scope.row)">删除</a>
                        <!-- <el-button size="mini" type="text" @click="addDevice(2, scope.row, $event)">编辑</el-button> -->
                        <!-- <el-button size="mini" type="text" @click="deleteHandle(scope.row)">删除</el-button> -->
                    </template>
                </el-table-column>
            </template>
@@ -233,14 +235,6 @@
            border-radius: 2px;
            border: 1px solid #435F9E;
        }
    }

    .el-button--mini {
        background: transparent;
    }

    .el-button--primary {
        background-color: transparent;
    }
}
</style>

 src/styles/index.scss

@@ -4,7 +4,10 @@
// @import './element-ui.scss';

// // @import './sidebar.scss';

// @import './style.scss';



@font-face {

  font-family: digital;

  src: url('../assets/DS-Digital.ttf');

}

body {

  height: 100%;

  -moz-osx-font-smoothing: grayscale;

@@ -92,22 +95,7 @@
  line-height: 32px;

}

.el-button--mini {

  background: #AAB6BA;

}

.el-button--primary {

  background: #5DD1FC;

}

// .el-popper[x-placement^=bottom] {

//   margin-top: 50px;

// }

.el-button--mini {

  background: transparent;

}

.el-button--primary {

  background-color: transparent;

}

.el-button--primary.active {

  background-color: #5DD1FC!important;

  // background: #AAB6BA;

}

.el-form-item__content {

  line-height: 40px;

@@ -122,4 +110,25 @@
  .el-input__inner {

    color: #000;

  }

}

.el-button {

  background: #AAB6BA;

  color: #90999C;

}

.el-button--primary {

  color: #FFF;

  background: #5DD1FC;

}

.table-action {

  display: inline-block;

  width: 92px;

  height: 32px;

  line-height: 32px;

  color: #5DD1FC;

  background: url('../assets/img/table-edit.png');

}

.table-del {

  margin-inline: 4px;

  color: #FF4342;

  background: url('../assets/img/table-del.png');

}

 src/views/login/index.vue

@@ -1,6 +1,5 @@
<template>

    <Home>

        <template slot="test"><span style="color: red">123</span></template>

        <template slot="content">

            <el-form class="login-form" autoComplete="on" :model="loginForm" :rules="loginRules" ref="loginForm"

                label-position="left">