Merge branch 'master' of http://www.beijingsoft.cn:9090/r/mdc-front

yangys

2024-01-14 4d18d6d118e265cb131c1ece7a0f0ab0a2db4ce7

Merge branch 'master' of http://www.beijingsoft.cn:9090/r/mdc-front

 src/api/Api.js

@@ -1,7 +1,7 @@
/*
 * @Date: 2024-01-10 20:37:45
 * @LastEditors: Sneed
 * @LastEditTime: 2024-01-14 16:17:20
 * @LastEditTime: 2024-01-14 16:44:10
 * @FilePath: /belleson-frontend/Users/mache/Documents/demo/mdc/src/api/Api.js
 */
import ajax from '@/utils/ajax'
@@ -46,6 +46,10 @@
        url: '/maintain/update',
        method: 'POST'
    },
    maintainDel: {
        url: '/maintain/delete',
        method: 'POST'
    },
    maintaindelete: {
        url: '/devicetype/delete',
        method: 'POST'

 src/container/Map/LeftStatus.vue

@@ -1,7 +1,7 @@
<!--
 * @Date: 2024-01-13 19:43:55
 * @LastEditors: Sneed
 * @LastEditTime: 2024-01-13 22:01:41
 * @LastEditTime: 2024-01-14 19:04:03
 * @FilePath: /belleson-frontend/Users/mache/Documents/demo/mdc/src/container/Map/LeftStatus.vue
-->
<template>
@@ -94,7 +94,7 @@
                    color: #D6EEEF;
                    position: relative;
                    & > div:first-child {
                        font-size: 23px;
                        font-size: 16px;
                        position: absolute;
                        left: 50%;
                        top: 50%;

 src/container/Map/Map.vue

@@ -1,7 +1,7 @@
<!--
 * @Date: 2024-01-05 23:47:53
 * @LastEditors: Sneed
 * @LastEditTime: 2024-01-14 15:07:18
 * @LastEditTime: 2024-01-14 16:50:48
 * @FilePath: /belleson-frontend/Users/mache/Documents/demo/mdc/src/container/Map/Map.vue
-->
<template>
@@ -279,12 +279,12 @@
            if (window.innerWidth - left < 100) {
                this.position = {
                    right: 0,
                    top: top - t + 10 + 'px'
                    top: top + 10 + 'px'
                }
            } else {
                this.position = {
                    left: left + 'px',
                    top: top -t + 10 + 'px'
                    top: top + 10 + 'px'
                }
            }
            
@@ -480,7 +480,7 @@
    overflow-x: scroll;
   
    .table-action {
        position: absolute;
        position: fixed;
        z-index: 999;
        color: #fff;
        width: 100px;

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

@@ -21,7 +21,7 @@
      <!-- 按钮 -->
        <span slot="footer" class="dialog-footer">
        <el-button size="mini" @click="cancel">取消</el-button>
        <el-button size="mini" type="primary" @click="dataFormSubmit()">保存</el-button>
        <el-button class="active" size="mini" type="primary" @click="dataFormSubmit()">保存</el-button>
      </span>
    </el-dialog>
  </div>

 src/container/ledger/index.vue

@@ -1,7 +1,7 @@
<!--
 * @Date: 2024-01-06 17:40:19
 * @LastEditors: Sneed
 * @LastEditTime: 2024-01-14 16:31:53
 * @LastEditTime: 2024-01-14 18:56:40
 * @FilePath: /belleson-frontend/Users/mache/Documents/demo/mdc/src/container/ledger/index.vue
-->
<template>
@@ -246,7 +246,7 @@
                cancelButtonText: '取消',
                type: 'warning'
            }).then(() => {
                getRequest('accountDel', { ids: [row.id].join(',') }).then(res => {
                getRequest('accountDel', { ids: [row.id] }).then(res => {
                    this.$message({
                        type: 'success',
                        message: '删除成功！'

 src/container/maintenance/index.vue

@@ -1,7 +1,7 @@
<!--
 * @Date: 2024-01-06 17:40:19
 * @LastEditors: Sneed
 * @LastEditTime: 2024-01-14 16:13:57
 * @LastEditTime: 2024-01-14 18:55:28
 * @FilePath: /belleson-frontend/Users/mache/Documents/demo/mdc/src/container/maintenance/index.vue
-->
<template>
@@ -194,8 +194,25 @@
                })
            }
        },
        deleteHandle() {

        deleteHandle(row) {
            this.$confirm('确定要永久删除此项?', '提示', {
                confirmButtonText: '确定',
                cancelButtonText: '取消',
                type: 'warning'
            }).then(() => {
                getRequest('maintainDel', { ids: [row.id] }).then(res => {
                    this.$message({
                        type: 'success',
                        message: '删除成功！'
                    })
                    this.submitForm()
                }).catch(() => {
                    this.$message({
                        type: 'info',
                        message: '已取消删除'
                    })
                })
            })
        },
        submitForm() {


 src/styles/index.scss

@@ -107,5 +107,5 @@
  background-color: transparent;

}

.el-button--primary.active {

  background-color: #5DD1FC;

  background-color: #5DD1FC!important;

}