update

gaosp

2024-01-23 51d0d474cfea8c0497a4e29b550a2e690e4b4bcf

update

 src/components/home/index.vue

@@ -1,7 +1,7 @@
<!--
 * @Date: 2024-01-04 19:40:32
 * @LastEditors: Sneed
 * @LastEditTime: 2024-01-23 18:38:18
 * @LastEditTime: 2024-01-23 20:08:52
 * @FilePath: /belleson-frontend/Users/mache/Documents/demo/mdc/src/components/home/index.vue
-->
<template>
@@ -11,7 +11,7 @@
            <div class="menu">
              <slot name="menu"></slot>
            </div>
            <p class="time">{{time1}}<span>{{time2}}</span></p>
            <p v-if="showTime" class="time">{{time1}}<span>{{time2}}</span></p>
        </div>
        <div class="content">
            <slot name="content"></slot>
@@ -27,20 +27,44 @@
    data () {
      return {
        time1: '',
        time2: ''
        time2: '',
        showTime: false
      }
    },
    created () {
      timer = setInterval(() => {
        this.time1 = dayjs().format('YYYY/MM/DD')
        this.time2 = dayjs().format('HH:mm:ss')
      },1000)
    watch: {
      $route: {
        handler (val) {
          // console.log('+++++++++++')
          // if (val.path !== '/') {
          //   this.showTime = false
          //   clearInterval(timer)
          // } else {
          //   // this.showTime = true
          //   // timer = setInterval(() => {
          //   //   this.time1 = dayjs().format('YYYY/MM/DD')
          //   //   this.time2 = dayjs().format('HH:mm:ss')
          //   // },1000)
          // }
        }
      },
      immediate:true,
      deep: true
    },
    mounted () {
      this.showTime = this.$route.path === '/'
      
      if (this.$route.path === '/') {
        timer = setInterval(() => {
          this.time1 = dayjs().format('YYYY/MM/DD')
          this.time2 = dayjs().format('HH:mm:ss')
        },1000)
      }
    },
    updated() {
      
    },
    beforeDestroy() {
      clearInterval(timer)
    },
    mounted () {
        console.log(this, '------')
    }
}
</script>

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

@@ -1,9 +1,8 @@
<template>
  <div>
    <el-dialog
      :title="!dataForm.id ? '新建' : '编辑'"
      :close-on-click-modal="false"
      width="20%"
      width="100%"
      @close="cancel"
      :visible.sync="addVisible">
      <!-- 添加内容-->
@@ -21,7 +20,7 @@
      </el-form>
      <!-- 按钮 -->
        <span slot="footer" class="dialog-footer">
        <el-button size="mini" @click="cancel">取消</el-button>
        <el-button type="ghost" size="mini" style="width: 150px" @click="cancel">取消</el-button>
        <el-button class="active" size="mini" type="primary" @click="dataFormSubmit()">保存</el-button>
      </span>
    </el-dialog>

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

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

    <div>

        <el-dialog :title="!dataForm.id ? '新建' : '编辑'" @close="cancel" :close-on-click-modal="false" width="80%"

        <el-dialog width="100%" @close="cancel" :close-on-click-modal="false"

            :visible.sync="addVisible">

            <!-- 添加内容-->

            <el-form :model="dataForm" label-width="100px" ref="dataForm">

@@ -166,7 +166,7 @@
                    </el-col>

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

                        <el-form-item label="设备管理分类" prop="manageType">

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

                            <el-select v-model="dataForm.manageType" placeholder="" clearable>

                                <el-option value="A">A</el-option>

                                <el-option value="B">B</el-option>

                                <el-option value="C">C</el-option>

@@ -238,8 +238,8 @@
            </el-form>

            <!-- 按钮 -->

            <span slot="footer" class="dialog-footer">

                <el-button size="mini" @click="cancel">取消</el-button>

                <el-button size="mini" type="primary" style="background-color: #409EFF;"

                <el-button type="ghost" size="mini" style="width: 150px" @click="cancel">取消</el-button>

                <el-button size="mini" type="primary" style="width: 150px"

                    @click="dataFormSubmit()">保存</el-button>

            </span>

        </el-dialog>

@@ -254,6 +254,7 @@
        return {

            visible: false,

            dataForm: {

                manageType: '',

                id: '', // title显示新增还是修改

                machineName: '', // 机床名

                machineIp: '', // 机床ip


 src/container/maintenance/dailyMAdd.vue

@@ -1,7 +1,7 @@
<!-- 日常保养 编辑 -->

<template>

    <!-- 新增弹框 -->

    <el-dialog :title="title" width="80%" :visible.sync="dialogVisibleAdd" class="role-select">

    <el-dialog 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">


 src/styles/index.scss

@@ -94,9 +94,6 @@
.el-input__icon {

  line-height: 32px;

}

.el-button--mini {

  // background: #AAB6BA;

}

.el-form-item__content {

  line-height: 40px;

}

@@ -112,12 +109,17 @@
  }

}

.el-button {

  min-width: 150px;

  background: #AAB6BA;

  color: #90999C;

}

.el-button--primary {

  color: #FFF;

  background: #5DD1FC;

}

.el-textarea__inner {

  background-color: transparent;

  border: 1px solid #435F9E;

}

.table-action {

  display: inline-block;

@@ -131,4 +133,18 @@
  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;

}