| src/container/Map/Map.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/container/component/index.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/container/deviceType/Manage-add-update.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/container/deviceType/index.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/container/ledger/Manage-add-update.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/container/ledger/index.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/container/machineList/Manage-add-update.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/container/machineList/index.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/container/maintenance/dailyMAdd.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/container/maintenance/index.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/container/workshop/index.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/styles/index.scss | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/views/login/index.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
src/container/Map/Map.vue
@@ -1,7 +1,7 @@ <!-- * @Date: 2024-01-05 23:47:53 * @LastEditors: Sneed * @LastEditTime: 2024-01-23 19:20:24 * @LastEditTime: 2024-01-23 21:41:33 * @FilePath: /belleson-frontend/Users/mache/Documents/demo/mdc/src/container/Map/Map.vue --> <template> @@ -47,7 +47,7 @@ </div> </div> </div> <el-dialog title="放置设备" :close-on-click-modal="false" width="20%" :visible.sync="addStatus"> <el-dialog title="放置设备" top="94px" :close-on-click-modal="false" width="100%" :visible.sync="addStatus" > <el-select class="wkshoplist" clearable v-model="deviceId" placeholder="请选择"> <el-option v-for="item in deviceList" :key="item.machineId" :label="item.machineName" :value="item.machineId"> @@ -539,10 +539,13 @@ z-index: 999; color: #fff; width: 100px; background: rgba(22,26,25,.8); border: 2px solid #416071; color: #ADAEAE; text-align: center; div { margin-top: 4px; cursor: pointer; padding: 8px 0; } div:hover { src/container/component/index.vue
@@ -1,12 +1,14 @@ <!-- * @Date: 2024-01-06 17:40:19 * @LastEditors: Sneed * @LastEditTime: 2024-01-23 19:14:03 * @LastEditTime: 2024-01-23 21:57:40 * @FilePath: /belleson-frontend/Users/mache/Documents/demo/mdc/src/container/component/index.vue --> <template> <div class="maintenance"> <div class="nav">工件信息</div> <div class="nav-top"> <span>工件信息</span> </div> <List ref="list" :url="url"> <template slot="search"> <div class="item"> src/container/deviceType/Manage-add-update.vue
@@ -1,6 +1,7 @@ <template> <div> <el-dialog top="94px" :close-on-click-modal="false" width="100%" @close="cancel" @@ -9,7 +10,7 @@ <el-form :model="dataForm" label-width="100px" ref="dataForm"> <el-row :gutter="24"> <el-col :xs="24":sm="24":md="24":lg="24":xl="24"> <el-col :xs="24":sm="6":md="6":lg="6":xl="6"> <el-form-item label="名称" prop="name"> <el-input v-model="dataForm.name" placeholder="名称" clearable></el-input> </el-form-item> src/container/deviceType/index.vue
@@ -1,12 +1,14 @@ <!-- * @Date: 2024-01-06 17:40:19 * @LastEditors: Sneed * @LastEditTime: 2024-01-23 19:19:35 * @LastEditTime: 2024-01-23 21:49:38 * @FilePath: /belleson-frontend/Users/mache/Documents/demo/mdc/src/container/deviceType/index.vue --> <template> <div class="maintenance"> <div class="nav">设备类型管理</div> <div class="nav"> <span>设备类型管理</span> </div> <List ref="list" :url="url"> <template slot="search"> <div class="item"> @@ -141,14 +143,6 @@ border-radius: 2px; border: 1px solid #435F9E; } } .el-button { background: #AAB6BA; color: #90999C; } .el-button--primary { color: #FFF; background: #5DD1FC; } } </style> src/container/ledger/Manage-add-update.vue
@@ -1,6 +1,6 @@ <template> <div> <el-dialog width="100%" @close="cancel" :close-on-click-modal="false" <el-dialog top="94px" :title="!dataForm.id ? '新建' : '编辑'" width="100%" @close="cancel" :close-on-click-modal="false" :visible.sync="addVisible"> <!-- 添加内容--> <el-form :model="dataForm" label-width="100px" ref="dataForm"> @@ -72,7 +72,7 @@ </el-col> <el-col :xs="24" :sm="6" :md="6" :lg="6" :xl="6"> <el-form-item label="设备类型" prop="deviceTypeId"> <el-select v-model="dataForm.deviceTypeId" placeholder="---请选择---" clearable> <el-select v-model="dataForm.deviceTypeId" placeholder="请选择" clearable> <el-option v-for="item in deviceTypeIds" :key="item.id" :label="item.name" :value="item.id"> </el-option> </el-select> @@ -80,7 +80,7 @@ </el-col> <el-col :xs="24" :sm="6" :md="6" :lg="6" :xl="6"> <el-form-item label="加工类型" prop="category"> <el-select v-model="dataForm.category" placeholder="---请选择---" clearable> <el-select v-model="dataForm.category" placeholder="请选择" clearable> <el-option v-for="item in deviceType" :key="item.value" :label="item.label" :value="item.value"> </el-option> @@ -90,7 +90,7 @@ <el-col :xs="24" :sm="6" :md="6" :lg="6" :xl="6"> <el-form-item label="账务属性" prop="accountingAttribute"> <el-select v-model="dataForm.accountingAttribute" placeholder="---请选择---" clearable> <el-select v-model="dataForm.accountingAttribute" placeholder="请选择" clearable> <el-option v-for="item in financePro" :key="item.value" :label="item.label" :value="item.value"> </el-option> @@ -113,7 +113,7 @@ </el-col> <!-- <el-col :xs="24":sm="6":md="6":lg="6":xl="6"> <el-form-item label="设备状态" prop="state"> <el-select v-model="dataForm.state" placeholder="---请选择---"> <el-select v-model="dataForm.state" placeholder="请选择"> <el-option v-for="item in deviceStatus" :key="item.value" @@ -176,7 +176,7 @@ <!-- <el-col :xs="24":sm="6":md="6":lg="6":xl="6"> <el-form-item label="班次" prop="classes"> <el-select v-model="dataForm.classes" placeholder="---请选择---"> <el-select v-model="dataForm.classes" placeholder="请选择"> <el-option value="一班">一班</el-option> <el-option value="二班">二班</el-option> <el-option value="三班">三班</el-option> @@ -379,7 +379,6 @@ }, /* 提交*/ dataFormSubmit() { debugger this.$refs.dataForm.validate((valid) => { console.log(valid) if (valid) { src/container/ledger/index.vue
@@ -1,12 +1,14 @@ <!-- * @Date: 2024-01-06 17:40:19 * @LastEditors: Sneed * @LastEditTime: 2024-01-23 19:19:40 * @LastEditTime: 2024-01-23 21:48:22 * @FilePath: /belleson-frontend/Users/mache/Documents/demo/mdc/src/container/ledger/index.vue --> <template> <div class="maintenance"> <div class="nav">台账</div> <div class="nav"> <span>台账</span> </div> <List ref="list" url="/account/pageQuery"> <template slot="search"> <div class="item"> @@ -285,15 +287,6 @@ border-radius: 2px; border: 1px solid #435F9E; } } .el-button { background: #AAB6BA; color: #90999C; } .el-button--primary { color: #FFF; background: #5DD1FC; } } </style> src/container/machineList/Manage-add-update.vue
@@ -1,6 +1,6 @@ <template> <div> <el-dialog :title="!dataForm.id ? '新建' : '编辑'" :close-on-click-modal="false" width="80%" :visible.sync="addVisible" <el-dialog top="94px" :title="!dataForm.id ? '新建' : '编辑'" :close-on-click-modal="false" width="100%" :visible.sync="addVisible" @close="cancel"> <!-- 添加内容--> <el-form :model="dataForm" :rules="rules" label-width="100px" ref="dataForm"> src/container/machineList/index.vue
@@ -1,12 +1,14 @@ <!-- * @Date: 2024-01-06 17:40:19 * @LastEditors: Sneed * @LastEditTime: 2024-01-23 19:19:45 * @LastEditTime: 2024-01-23 21:50:06 * @FilePath: /belleson-frontend/Users/mache/Documents/demo/mdc/src/container/machineList/index.vue --> <template> <div class="maintenance"> <div class="nav">机床采集</div> <div class="nav"> <span>机床采集</span> </div> <List ref="list" url="/machine/pageQuery"> <template slot="search"> <div class="item"> src/container/maintenance/dailyMAdd.vue
@@ -1,13 +1,13 @@ <!-- 日常保养 编辑 --> <template> <!-- 新增弹框 --> <el-dialog width="100%" :visible.sync="dialogVisibleAdd" class="role-select"> <el-dialog top="94px" :title="title" width="100%" :visible.sync="dialogVisibleAdd" class="role-select"> <!-- 查询表单 --> <el-form :model="dataForm" ref="dataForm" label-width="150px" style="margin-top:10px;"> <el-row :gutter="24"> <el-col :xs="24" :sm="6" :md="6" :lg="6" :xl="6"> <el-form-item label="设备名称" prop="machineName"> <el-select filterable 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> @@ -16,7 +16,7 @@ </el-col> <el-col :xs="24" :sm="6" :md="6" :lg="6" :xl="6"> <el-form-item label="使用部门" prop="department"> <el-select v-model="dataForm.department" placeholder="---请选择---" clearable> <el-select v-model="dataForm.department" placeholder="请选择" clearable> <el-option v-for="item in departmentlist" :key="item.value" :label="item.label" :value="item.value"> </el-option> @@ -25,7 +25,7 @@ </el-col> <el-col :xs="24" :sm="6" :md="6" :lg="6" :xl="6"> <el-form-item label="保养者" prop="maintainPerson"> <el-select v-model="dataForm.userId" placeholder="---请选择---" clearable> <el-select v-model="dataForm.userId" placeholder="请选择" clearable> <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id"> </el-option> </el-select> @@ -33,7 +33,7 @@ </el-col> <el-col :xs="24" :sm="6" :md="6" :lg="6" :xl="6"> <el-form-item label="是否合格" prop="isQualified"> <el-select v-model="dataForm.isQualified" placeholder="---请选择---" clearable> <el-select v-model="dataForm.isQualified" placeholder="请选择" clearable> <el-option v-for="item in isQualified" :key="item.value" :label="item.label" :value="item.value"> </el-option> </el-select> @@ -41,21 +41,21 @@ </el-col> <el-col :xs="24" :sm="6" :md="6" :lg="6" :xl="6"> <el-form-item label="保养内容与存在问题" prop="detail"> <el-input size="mini" type="text" v-model="dataForm.detail" clearable></el-input> <el-input size="mini" type="textarea" rows="4" v-model="dataForm.detail" clearable></el-input> </el-form-item> </el-col> <el-col :xs="24" :sm="6" :md="6" :lg="6" :xl="6"> </el-col> <el-col :xs="24" :sm="10" :md="10" :lg="10" :xl="10"> <el-col :xs="24" :sm="8" :md="8" :lg="8" :xl="8"> <el-form-item label="计划开始日期" prop="planStartDate"> <el-date-picker format="yyyy 年 MM 月 dd 日" value-format="yyyy-MM-dd" v-model="dataForm.planStartDate" <el-date-picker format="yyyy-MM-dd" value-format="yyyy-MM-dd" v-model="dataForm.planStartDate" range-separator="至" clearable type="daterange" start-placeholder="开始日期" end-placeholder="结束日期"> </el-date-picker> </el-form-item> </el-col> <el-col :xs="24" :sm="10" :md="10" :lg="10" :xl="10"> <el-col :xs="24" :sm="8" :md="8" :lg="8" :xl="8"> <el-form-item label="计划完成日期" prop="planFinishDate"> <el-date-picker format="yyyy 年 MM 月 dd 日" value-format="yyyy-MM-dd" <el-date-picker format="yyyy-MM-dd" value-format="yyyy-MM-dd" v-model="dataForm.planFinishDate" range-separator="至" clearable type="daterange" start-placeholder="开始日期" end-placeholder="结束日期"> </el-date-picker> @@ -63,11 +63,10 @@ </el-col> </el-row> </el-form> <div style="display: flex;justify-content: center;align-items: center;margin-top:15px;"> <div slot="footer" class="dialog-footer"> <el-button size="mini" type="primary" @click="savedata()" plain>保存</el-button> <el-button size="mini" type="warning" @click="resetForm()" plain>重置</el-button> <el-button size="mini" type="ghost" @click="resetForm()" plain>重置</el-button> </div> </el-dialog> </template> @@ -145,7 +144,9 @@ } catch (error) { } if (completeDateFrom < startDateFrom ) { return this.$message('开始日期不能大于完成日期') } if (this.no === 1) { console.log({ ...this.dataForm, src/container/maintenance/index.vue
@@ -1,12 +1,14 @@ <!-- * @Date: 2024-01-06 17:40:19 * @LastEditors: Sneed * @LastEditTime: 2024-01-23 19:16:16 * @LastEditTime: 2024-01-23 21:50:15 * @FilePath: /belleson-frontend/Users/mache/Documents/demo/mdc/src/container/maintenance/index.vue --> <template> <div class="maintenance"> <div class="nav">设备保养/{{navName}}</div> <div class="nav"> <span>设备保养/{{navName}}</span> </div> <List ref="list" url="/maintain/pageQuery"> <template slot="search"> <div class="item"> src/container/workshop/index.vue
@@ -1,21 +1,23 @@ <!-- * @Date: 2024-01-06 17:40:19 * @LastEditors: Sneed * @LastEditTime: 2024-01-21 21:45:24 * @LastEditTime: 2024-01-23 21:50:27 * @FilePath: /belleson-frontend/Users/mache/Documents/demo/mdc/src/container/workshop/index.vue --> <template> <div class="workshop"> <div class="nav">车间列表 / {{ this.$route.query.name }}</div> <div class="nav"> <span>车间列表 / {{ this.$route.query.name }}</span> </div> <div class="workshop-box"> <LeftStatus :info="info" /> <div class="right"> <Status class="right-status" :info="info" style="justify-content: flex-start;"> <template slot="before"> <div style="margin-right: auto;"> <el-button type="primary" size="mini" :class="concernFlag === '' ? 'active' : ''" <el-button :type="concernFlag === '' ? 'primary' : 'ghost'" size="mini" @click="query('')">全部</el-button> <el-button type="primary" size="mini" :class="concernFlag === 1 ? 'active' : ''" <el-button :type="concernFlag === 1 ? 'primary' : 'ghost'" size="mini" @click="query(1)">关注</el-button> <!-- <el-button type="primary" size="mini" style="margin-right: auto;">我的关注</el-button> --> </div> src/styles/index.scss
@@ -83,68 +83,119 @@ .app-container { padding: 20px; } .el-input__inner { background: transparent; border-radius: 2px; border: 1px solid #435F9E; height: 32px; line-height: 32px; color: #C6DCE0; } .el-input__icon { line-height: 32px; } .el-form-item__content { line-height: 40px; } .el-form-item { margin-bottom: 22px; } .el-form-item__label { font-size: 12px; } .el-dialog__wrapper { #app { .el-input__inner { color: #000; background: transparent; border-radius: 2px; border: 1px solid #435F9E; height: 32px; line-height: 32px; color: #FFF; } .el-textarea__inner { color: #FFF; } .el-input__icon { // line-height: 32px; } .el-form-item__content { line-height: 40px; } .el-form-item { margin-bottom: 22px; } .el-form-item__label { font-size: 12px; } .el-dialog__wrapper { .el-input__inner { color: #000; } } .el-button,.el-button:hover,.el-button:active,.el-button:focus { border: none; min-width: 150px; // background: rgba(22,26,25,.8); // background: #AAB6BA; background-color: rgba(170,182,186,0.2); color: #90999C; border: 1px solid #5DD1FC; color: #5DD1FC; } .el-button:focus, .el-button:hover { background: #AAB6BA; } .el-button--primary,.el-button--primary:active,.el-button--primary:hover,.el-button--primary:focus { color: #FFF; background: #5DD1FC; } .el-textarea__inner { background-color: transparent; border: 1px solid #435F9E; } .table-action { display: inline-block; width: 92px; height: 32px; line-height: 32px; color: #5DD1FC; background: url('../assets/img/table-edit.png'); background-size: contain; } .table-del { margin-inline: 4px; color: #FF4342; background: url('../assets/img/table-del.png'); background-size: contain; } .el-dialog { // background: ; background-image: url('~@/assets/img/login/bg.png'); background-size: cover; background-repeat: no-repeat; color: #FFF; height: calc(100vh - 130px); display: flex; flex-direction: column; .el-dialog__body { flex: 1 1 auto; } .el-dialog__title { color: #FFF; font-size: 14px; } } .el-dialog__wrapper .el-input__inner { color: #FFF; } .el-form-item__content .el-input__inner { color: #FFF!important; } .el-range-editor .el-range-input { background-color: transparent; color: #FFF; } .el-form-item__label { color: #fff; } .el-pager li.active { color: #FFF; background: linear-gradient(180deg, #00FFFF 0%, #008CFF 100%); } } .el-button { min-width: 150px; background: #AAB6BA; color: #90999C; .nav-top { position: relative; span { font-size: 14px; padding-left: 10px; } } .el-button--primary { color: #FFF; background: #5DD1FC; .nav-top::before { content: ''; width: 2px; height: 16px; position: absolute; top: 50%; transform: translateY(-50%); background: #4DC3FF; } .el-textarea__inner { background-color: transparent; border: 1px solid #435F9E; } .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'); } .el-dialog { // background: ; background-image: url('~@/assets/img/login/bg.png'); background-size: cover; background-repeat: no-repeat; color: #FFF; height: 85vh; } .el-dialog__wrapper .el-input__inner { color: #FFF; } .el-form-item__content .el-input__inner { color: #FFF!important; } src/views/login/index.vue
@@ -123,6 +123,14 @@ $light_gray: #eee; /* reset element-ui css */ #app .login-form .el-input__inner { background: transparent; border-radius: 2px; height: 32px; line-height: 32px; color: #FFF; border: none; } .login-form .el-input { display: inline-block; // height: 47px;
