1、优化车间看板页面开启拖拽及缩放功能时关闭鼠标悬浮弹出设备详情弹窗功能 2、优化用户登陆时若输入密码错误后登录按钮将被禁用问题

zhuzhuanzhuan

2023-11-13 a2b2309c0cead11d8b73c2f0f52f05df4a9fa588

1、优化车间看板页面开启拖拽及缩放功能时关闭鼠标悬浮弹出设备详情弹窗功能
2、优化用户登陆时若输入密码错误后登录按钮将被禁用问题

 package-lock.json

ÎļþÌ«´ó

 package.json

@@ -12,6 +12,7 @@
  "dependencies": {
    "@antv/data-set": "^0.11.4",
    "@jeecg/antd-online-mini": "3.0.0-RC",
    "@jiaminghi/data-view": "^2.10.0",
    "@tinymce/tinymce-vue": "2.1.0",
    "@toast-ui/editor": "^2.1.2",
    "ali-oss": "^6.17.1",
@@ -126,4 +127,4 @@
    "last 2 versions",
    "not ie <= 8"
  ]
}
}

 src/main.js

@@ -69,8 +69,8 @@
})

// å°†è‡ªåŠ¨æ³¨å†Œæ‰€æœ‰ç»„件为全局组件
// import dataV from '@jiaminghi/data-view'
// Vue.use(dataV)
import dataV from '@jiaminghi/data-view'
Vue.use(dataV)

import VueDragResize from "vue-drag-resize"
Vue.component('vue-drag-resize', VueDragResize)

 src/views/WorkshopSignage.vue

@@ -14,7 +14,7 @@
            :disabled="isSwitchChecked"
          />
        </a-space>
        <a-button type="primary" icon="save" size="large" @click="saveDevicePositionAndSizeByApi">保存位置 </a-button>
        <a-button type="primary" icon="save" size="large" @click="saveDevicePositionAndSizeByApi">保存位置</a-button>
      </div>
    </header>

@@ -267,19 +267,21 @@
      },

      openDetail(item) {
        if (item.equipmentStatus == 0) {
          // this.$message.warn("设备处于关机状态！");
          this.$message.warning('设备处于关机状态！')
          return false
        if (!this.isSwitchChecked) {
          if (item.equipmentStatus == 0) {
            // this.$message.warn("设备处于关机状态！");
            this.$message.warning('设备处于关机状态！')
            return false
          }
          console.log(item)
          console.log(this.$refs.EquipmentDetailModal)
          this.$refs.EquipmentDetailModal.initData(item.equId)
          this.$refs.EquipmentDetailModal.timerModel(item.equId)
          // this.equipMessageTimer = setInterval(() => {
          //   setTimeout( this.$refs.equmentDetaiModel.initData(item.equipmentId),0)
          // },1000*10)
        }
        console.log(item)
        console.log(this.$refs.EquipmentDetailModal)
        this.$refs.EquipmentDetailModal.initData(item.equId)
        this.$refs.EquipmentDetailModal.timerModel(item.equId)
        // this.equipMessageTimer = setInterval(() => {
        //   setTimeout( this.$refs.equmentDetaiModel.initData(item.equipmentId),0)
        // },1000*10)
      },
      }

    },
    created() {

 src/views/user/Login.vue

@@ -170,9 +170,9 @@
        duration: 4,
      });
      //账户密码登录错误后更新验证码
      if (this.customActiveKey === 'tab1' && description.indexOf('密码错误') > 0) {
        this.$refs.alogin.handleChangeCheckCode()
      }
      // if (this.customActiveKey === 'tab1' && description.indexOf('密码错误') > 0) {
      //   this.$refs.alogin.handleChangeCheckCode()
      // }
      this.loginBtn = false;
    },
    loginSelectOk() {