1、新增mdc页面接口文件 2、优化功能

zhuzhuanzhuan

2023-09-18 70b734a3a3641f7a10f59ee4669d1cd44200f59d

1、新增mdc页面接口文件
2、优化功能

 package-lock.json

@@ -2988,6 +2988,18 @@
          "integrity": "sha512-RZKhC3EmpBchfTGBVb8fb+RL2cWyw/32lshnsETttkBAyAUXSGHxbEJWWRXc751DrIxG1q04b8QwMbAwkRPpUA==",
          "dev": true
        },
        "mini-css-extract-plugin": {
          "version": "0.8.2",
          "resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-0.8.2.tgz",
          "integrity": "sha512-a3Y4of27Wz+mqK3qrcd3VhYz6cU0iW5x3Sgvqzbj+XmlrSizmvu8QQMl5oMYJjgHOC4iyt+w7l4umP+dQeW3bw==",
          "dev": true,
          "requires": {
            "loader-utils": "^1.1.0",
            "normalize-url": "1.9.1",
            "schema-utils": "^1.0.0",
            "webpack-sources": "^1.1.0"
          }
        },
        "ms": {
          "version": "2.1.2",
          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
@@ -3869,6 +3881,41 @@
      "resolved": "https://registry.npmjs.org/ajv-errors/-/ajv-errors-1.0.1.tgz",
      "integrity": "sha512-DCRfO/4nQ+89p/RK43i8Ezd41EqdGIU4ld7nGF8OQ14oc/we5rEntLCUa7+jrn3nn83BosfwZA0wb4pon2o8iQ==",
      "dev": true
    },
    "ajv-formats": {
      "version": "2.1.1",
      "resolved": "https://registry.npmjs.org/ajv-formats/-/ajv-formats-2.1.1.tgz",
      "integrity": "sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA==",
      "dev": true,
      "requires": {
        "ajv": "^8.0.0"
      },
      "dependencies": {
        "ajv": {
          "version": "8.12.0",
          "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz",
          "integrity": "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==",
          "dev": true,
          "requires": {
            "fast-deep-equal": "^3.1.1",
            "json-schema-traverse": "^1.0.0",
            "require-from-string": "^2.0.2",
            "uri-js": "^4.2.2"
          }
        },
        "json-schema-traverse": {
          "version": "1.0.0",
          "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
          "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
          "dev": true
        },
        "require-from-string": {
          "version": "2.0.2",
          "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz",
          "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==",
          "dev": true
        }
      }
    },
    "ajv-keywords": {
      "version": "3.5.1",
@@ -5132,6 +5179,11 @@
          "requires": {
            "ms": "2.0.0"
          }
        },
        "qs": {
          "version": "6.7.0",
          "resolved": "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz",
          "integrity": "sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ=="
        }
      }
    },
@@ -9301,6 +9353,11 @@
          "requires": {
            "ms": "2.0.0"
          }
        },
        "qs": {
          "version": "6.7.0",
          "resolved": "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz",
          "integrity": "sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ=="
        }
      }
    },
@@ -11983,26 +12040,63 @@
      "integrity": "sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ=="
    },
    "mini-css-extract-plugin": {
      "version": "0.8.2",
      "resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-0.8.2.tgz",
      "integrity": "sha512-a3Y4of27Wz+mqK3qrcd3VhYz6cU0iW5x3Sgvqzbj+XmlrSizmvu8QQMl5oMYJjgHOC4iyt+w7l4umP+dQeW3bw==",
      "version": "2.7.6",
      "resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-2.7.6.tgz",
      "integrity": "sha512-Qk7HcgaPkGG6eD77mLvZS1nmxlao3j+9PkrT9Uc7HAE1id3F41+DdBRYRYkbyfNRGzm8/YWtzhw7nVPmwhqTQw==",
      "dev": true,
      "requires": {
        "loader-utils": "^1.1.0",
        "normalize-url": "1.9.1",
        "schema-utils": "^1.0.0",
        "webpack-sources": "^1.1.0"
        "schema-utils": "^4.0.0"
      },
      "dependencies": {
        "schema-utils": {
          "version": "1.0.0",
          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz",
          "integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==",
        "@types/json-schema": {
          "version": "7.0.12",
          "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.12.tgz",
          "integrity": "sha512-Hr5Jfhc9eYOQNPYO5WLDq/n4jqijdHNlDXjuAQkkt+mWdQR+XJToOHrsD4cPaMXpn6KO7y2+wM8AZEs8VpBLVA==",
          "dev": true
        },
        "ajv": {
          "version": "8.12.0",
          "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz",
          "integrity": "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==",
          "dev": true,
          "requires": {
            "ajv": "^6.1.0",
            "ajv-errors": "^1.0.0",
            "ajv-keywords": "^3.1.0"
            "fast-deep-equal": "^3.1.1",
            "json-schema-traverse": "^1.0.0",
            "require-from-string": "^2.0.2",
            "uri-js": "^4.2.2"
          }
        },
        "ajv-keywords": {
          "version": "5.1.0",
          "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz",
          "integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==",
          "dev": true,
          "requires": {
            "fast-deep-equal": "^3.1.3"
          }
        },
        "json-schema-traverse": {
          "version": "1.0.0",
          "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
          "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
          "dev": true
        },
        "require-from-string": {
          "version": "2.0.2",
          "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz",
          "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==",
          "dev": true
        },
        "schema-utils": {
          "version": "4.2.0",
          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.2.0.tgz",
          "integrity": "sha512-L0jRsrPpjdckP3oPug3/VxNKt2trR8TcabrM6FOAAlvC/9Phcmm+cuAgTlxBqdBR1WJx7Naj9WHw+aOmheSVbw==",
          "dev": true,
          "requires": {
            "@types/json-schema": "^7.0.9",
            "ajv": "^8.9.0",
            "ajv-formats": "^2.1.1",
            "ajv-keywords": "^5.1.0"
          }
        }
      }
@@ -14709,9 +14803,12 @@
      "integrity": "sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc="
    },
    "qs": {
      "version": "6.7.0",
      "resolved": "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz",
      "integrity": "sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ=="
      "version": "6.11.2",
      "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.2.tgz",
      "integrity": "sha512-tDNIz22aBzCDxLtVH++VnTfzxlfeK5CbqohpSqpJgj1Wg/cQbStNAz3NuqCs5vV+pjBsK4x4pN9HlVh7rcYRiA==",
      "requires": {
        "side-channel": "^1.0.4"
      }
    },
    "query-string": {
      "version": "4.3.4",
@@ -15355,6 +15452,14 @@
      "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
    },
    "sass-loader": {
      "version": "13.3.2",
      "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-13.3.2.tgz",
      "integrity": "sha512-CQbKl57kdEv+KDLquhC+gE3pXt74LEAzm+tzywcA0/aHZuub8wTErbjAoNI57rPUWRYRNC5WUnNl8eGJNbDdwg==",
      "requires": {
        "neo-async": "^2.6.2"
      }
    },
    "sax": {
      "version": "1.2.4",
      "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
@@ -15594,6 +15699,23 @@
      "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.7.2.tgz",
      "integrity": "sha512-mRz/m/JVscCrkMyPqHc/bczi3OQHkLTqXHEFu0zDhK/qfv3UcOA4SVmRCLmos4bhjr9ekVQubj/R7waKapmiQg==",
      "dev": true
    },
    "side-channel": {
      "version": "1.0.4",
      "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz",
      "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==",
      "requires": {
        "call-bind": "^1.0.0",
        "get-intrinsic": "^1.0.2",
        "object-inspect": "^1.9.0"
      },
      "dependencies": {
        "object-inspect": {
          "version": "1.12.3",
          "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.3.tgz",
          "integrity": "sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g=="
        }
      }
    },
    "signal-exit": {
      "version": "3.0.3",
@@ -16187,13 +16309,9 @@
      "dev": true
    },
    "style-loader": {
      "version": "0.19.1",
      "resolved": "https://registry.npmjs.org/style-loader/-/style-loader-0.19.1.tgz",
      "integrity": "sha512-IRE+ijgojrygQi3rsqT0U4dd+UcPCqcVvauZpCnQrGAlEe+FUIyrK93bUDScamesjP08JlQNsFJU+KmPedP5Og==",
      "requires": {
        "loader-utils": "^1.0.2",
        "schema-utils": "^0.3.0"
      }
      "version": "3.3.3",
      "resolved": "https://registry.npmjs.org/style-loader/-/style-loader-3.3.3.tgz",
      "integrity": "sha512-53BiGLXAcll9maCYtZi2RCQZKa8NQQai5C4horqKyRmHj9H7QmcUyucrH+4KW/gBQbXM2AsB0axoEcFZPlfPcw=="
    },
    "stylehacks": {
      "version": "4.0.3",
@@ -17146,6 +17264,11 @@
        "lodash.find": "^4.6.0"
      }
    },
    "vue-calendar-component": {
      "version": "2.8.2",
      "resolved": "https://registry.npmjs.org/vue-calendar-component/-/vue-calendar-component-2.8.2.tgz",
      "integrity": "sha512-BJh7xOBzM7QVcapcN4EbPQ1eZ8Pii1/oy+dzqjZTilRSIDD7SRPdFpnUJwZvs8lCrhtBAyJbYFsdm2SogXWHVQ=="
    },
    "vue-cropper": {
      "version": "0.5.4",
      "resolved": "https://registry.npmjs.org/vue-cropper/-/vue-cropper-0.5.4.tgz",
@@ -17280,6 +17403,15 @@
          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
        },
        "style-loader": {
          "version": "0.19.1",
          "resolved": "https://registry.npmjs.org/style-loader/-/style-loader-0.19.1.tgz",
          "integrity": "sha512-IRE+ijgojrygQi3rsqT0U4dd+UcPCqcVvauZpCnQrGAlEe+FUIyrK93bUDScamesjP08JlQNsFJU+KmPedP5Og==",
          "requires": {
            "loader-utils": "^1.0.2",
            "schema-utils": "^0.3.0"
          }
        },
        "supports-color": {
          "version": "5.5.0",
          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",

 package.json

@@ -32,6 +32,8 @@
    "md5": "^2.2.1",
    "nprogress": "^0.2.0",
    "qs": "^6.11.1",
    "sass-loader": "^13.3.2",
    "style-loader": "^3.3.3",
    "tinymce": "5.4.1",
    "viser-vue": "^2.4.8",
    "vue": "^2.6.10",

 src/api/mdc.js

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,7 @@
import { getAction, deleteAction, putAction, postAction, httpAction } from '@/api/manage'

export default {
//  -------------------------------------驱动参数管理页面----------------------------------------
//  èŽ·å–控制系统类型
  getDriveTypeApi:()=>getAction('/mdc/mdcDriveTypeParamConfig/getDriveParamOptions')
}

 src/mixins/JeecgListMixin.js

@@ -139,7 +139,6 @@
          return false;
        }
      }

      return filterObj(param);
    },
    getQueryField() {
@@ -257,6 +256,7 @@
      this.$refs.modalForm.edit(record);
      this.$refs.modalForm.title = "编辑";
      this.$refs.modalForm.disableSubmit = false;

    },
    handleAdd: function () {
      this.$refs.modalForm.add();
@@ -287,10 +287,18 @@
      //清空列表选中
      this.onClearSelected()
    },
    /**
     * ç‚¹å‡»è¡¨æ ¼ä¸­è¯¦æƒ…按钮事件
     * @param record é€‰ä¸­çš„当前行数据
     */
    handleDetail:function(record){
      this.$refs.modalForm.edit(record);
      this.$refs.modalForm.title="详情";
      this.$refs.modalForm.disableSubmit = true;
      // æ‰“开详情抽屉时禁用设备编码、设备名称输入框
      this.$refs.modalForm.disSeach = true;
      // è°ƒç”¨æŠ½å±‰è¡¨å•ç»„件中的清除表单验证方法
      this.$refs.modalForm.removeValidate()
    },
    /* å¯¼å‡º */
    handleExportXls2(){

 src/views/mdc/base/EquipmentList.vue

@@ -443,6 +443,8 @@
        this.$refs.modalForm.title = "编辑";
        this.$refs.modalForm.disableSubmit = false;
        this.$refs.modalForm.disSeach = true;
        // è°ƒç”¨æŠ½å±‰è¡¨å•ç»„件中的清除表单验证方法
        this.$refs.modalForm.removeValidate()
      },
      handleAdd: function () {
        this.$refs.modalForm.add();
@@ -453,7 +455,6 @@
      getAvatarView: function (avatar) {
        return getFileAccessHttpUrl(avatar)
      },

      batchFrozen: function (status) {
        if (this.selectedRowKeys.length <= 0) {
          // this.$message.warning('请选择一条记录！');

 src/views/mdc/base/MdcDriveTypeParamConfigList.vue

@@ -14,10 +14,15 @@
            :sm="24"
          >
            <a-form-item label="控制系统类型">
              <j-dict-select-tag
                placeholder="请选择控制系统类型"
              <!--<j-dict-select-tag-->
                <!--placeholder="请选择控制系统类型"-->
                <!--v-model="queryParam.controlSystemType"-->
              <!--/>-->
              <a-auto-complete
                v-model="queryParam.controlSystemType"
                dictCode="mdc_driveType"
                :data-source="driveTypeList"
                placeholder="请选择控制系统类型"
                :filter-option="filterOption"
              />
            </a-form-item>
          </a-col>
@@ -261,6 +266,7 @@
    <mdc-drive-type-param-config-modal
      ref="modalForm"
      @ok="modalFormOk"
      :driveTypeList="driveTypeList"
    ></mdc-drive-type-param-config-modal>
  </a-card>
</template>
@@ -273,6 +279,7 @@
import MdcDriveTypeParamConfigModal from './modules/mdcDriveTypeParamConfig/MdcDriveTypeParamConfigModal'
import { filterMultiDictText } from '@/components/dict/JDictSelectUtil'
import { filterObj } from '@/utils/util';
import api from '@/api/mdc'
export default {
  name: 'MdcDriveTypeParamConfigList',
  mixins: [JeecgListMixin, mixinDevice],
@@ -349,12 +356,19 @@
      },
      dictOptions: {},
      superFieldList: [],
      driveTypeList:[]
    }
  },
  provide(){
    return {
      driveTypeList:this.driveTypeList
    }
  },
  created() {
    this.$set(this.dictOptions, 'showFlag', [{ text: '是', value: 'Y' }, { text: '否', value: 'N' }])
    this.$set(this.dictOptions, 'curveGenerationFlags', [{ text: '是', value: 'Y' }, { text: '否', value: 'N' }])
    this.getSuperFieldList();
    this.getDriveTypeByApi()
  },
  computed: {
    importExcelUrl: function () {
@@ -389,6 +403,26 @@
      param.pageSize = this.ipagination.pageSize
      return filterObj(param)
    },
    /**
     * è°ƒç”¨æŽ¥å£èŽ·å–控制系统类型
     */
    getDriveTypeByApi(){
      api.getDriveTypeApi().then((res)=>{
        console.log(res)
        this.driveTypeList=res.result.map(item=>item.value)
      })
    },
    /**
     * è”想输入框筛选功能
     * @param input
     * @param option
     * @returns {boolean}
     */
    filterOption(input, option) {
      return (
        option.componentOptions.children[0].text.toUpperCase().indexOf(input.toUpperCase()) >= 0
      );
    },

  }
}

 src/views/mdc/base/modules/EquipmentList/UserModal.vue

@@ -1,12 +1,11 @@
<template>
  <a-drawer
  <a-modal
    :title="title"
    :maskClosable="true"
    :width="drawerWidth"
    placement="right"
    :closable="true"
    @close="handleCancel"
    @cancel="handleCancel"
    :visible="visible"
    :footer="null"
    style="height: 100%;overflow: auto;padding-bottom: 53px;">

    <template slot="title">
@@ -26,7 +25,7 @@
            <a-form-model-item label="设备编码" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="equipmentId">
              <a-input-search :readOnly="true"
                              v-model="model.equipmentId"
                              :disabled="disSeach"   @search="deviceSearch" enter-button placeholder='请选择设备编码'/>
                              :disabled="disSeach"   @search="deviceSearch" enter-button placeholder='请选择设备编码' />
            </a-form-model-item>
          </a-col>
          <a-col :span="12">
@@ -148,13 +147,13 @@


    <div class="drawer-bootom-button" v-show="!disableSubmit">
      <a-popconfirm title="确定放弃编辑？" @confirm="handleCancel" okText="确定" cancelText="取消">
      <a-popconfirm title="确定放弃操作？" @confirm="handleCancel" okText="确定" cancelText="取消">
        <a-button style="margin-right: .8rem">取消</a-button>
      </a-popconfirm>
      <a-button @click="handleSubmit" type="primary" :loading="confirmLoading">提交</a-button>
    </div>
    <device-list-model ref="deviceListModel" @sendSelectionRows="getDeviceRows"></device-list-model>
  </a-drawer>
  </a-modal>

</template>

@@ -203,7 +202,7 @@
          equipmentId:
            [
              {
              required: true, message: '请选择设备编号!',
              required: true, message: '请选择设备编号!'
              },
              // {
              // validator: this.validatequipmentId
@@ -349,6 +348,7 @@
        that.visible = true;
        //根据屏幕宽度自适应抽屉宽度
        this.resetScreenSize();

        // that.userId = record.id;
        // console.log(record)
        that.model = Object.assign({}, record);
@@ -451,8 +451,6 @@
        })
      },



      refresh () {
        this.userId=""
        this.nextDepartOptions=[];
@@ -554,9 +552,6 @@
      handleCancel () {
        this.close()
      },



      // validatequipmentId(rule, value, callback){
      //   if(!value){
      //     callback()
@@ -589,8 +584,15 @@
        }else{
          this.departIdShow=true;
        }
      },
      /**
       * ç¼–辑或查看详情数据时清除抽屉表单验证
       */
      removeValidate(){
        this.$refs.form.clearValidate()
      }
    }
    },

  }
</script>


 src/views/mdc/base/modules/TorqueconfigurationList/TorqueconfigurationList.vue

@@ -544,7 +544,7 @@
            //重新计算分页问题
            that.reCalculatePage(1)
            // that.$message.success(res.message);
            that.$notification.warning({
            that.$notification.success({
              message:'消息',
              description:res.message
            });

 src/views/mdc/base/modules/deviceRepair/DeviceRepairList.vue

@@ -33,10 +33,10 @@
    </div>
    <!-- æ“ä½œæŒ‰é’®åŒºåŸŸ -->
    <div class="table-operator" style="display: inline;">
      <a-button v-has="'user.addrequip'" @click="handleAdd" type="primary" icon="plus">维修新增
      <a-button  @click="handleAdd" type="primary" icon="plus">新增
      </a-button>
      <a-button v-has="'user.add'"  @click="handleAddXIU" type="primary" icon="plus">休班新增
      </a-button>
      <!--<a-button v-has="'user.add'"  @click="handleAddXIU" type="primary" icon="plus">休班新增-->
      <!--</a-button>-->
    </div>

    <!-- table区域-begin -->
@@ -64,9 +64,9 @@
    </div>
    <!-- table区域-end -->
    <device-repair-model ref="modalForm" @ok="modalFormOk"></device-repair-model>
    <device-repair-model-add  ref="modalFormadd" @ok="modalFormOk"></device-repair-model-add>
    <!--<device-repair-model-add  ref="modalFormadd" @ok="modalFormOk"></device-repair-model-add>-->
    <device-repair-model-edit ref="modalFormedit" @ok="modalFormOk"></device-repair-model-edit>
    <!--<repair-model ref="repairModelFrom" @ok="modalFormOk"></repair-model>-->
    <!--<repair-model ref="repairModelFrom" @ok="modalFormOk">0</repair-model>-->

  </a-card>
</template>
@@ -481,7 +481,7 @@
            //重新计算分页问题
            that.reCalculatePage(1)
            // that.$message.success(res.message);
            that.$notification.warning({
            that.$notification.success({
              message:'消息',
              description:res.message
            });
@@ -495,16 +495,19 @@
          }
        });
      },
      /**
       * æ‰“开新增维修或休班弹窗
       */
      handleAdd() {
        this.$refs.modalForm.add(this.node)
        this.$refs.modalForm.title = '新增'
        this.$refs.modalForm.disableSubmit = false
      },
      handleAddXIU() {
        this.$refs.modalFormadd.add()
        this.$refs.modalFormadd.title = '新增'
        this.$refs.modalFormadd.disableSubmit = false
      },
      // handleAddXIU() {
      //   this.$refs.modalFormadd.add()
      //   this.$refs.modalFormadd.title = '新增'
      //   this.$refs.modalFormadd.disableSubmit = false
      // },
      pQuery(parentId) {
        this.queryParam.parentId = parentId[0]
        if(this.selectedRowKeys.length >= 1) {

 src/views/mdc/base/modules/deviceRepair/DeviceRepairModel.vue

@@ -25,6 +25,22 @@
            </a-form-item>
          </a-col>
        </a-row>

        <a-row :gutter="24" >
          <a-col :span="24">
            <a-form-item label="维修类型" :labelCol="labelColLong" :wrapperCol="wrapperColLong">
              <a-radio-group v-decorator="['mdcRepairType', validatorRules.mdcRepairType]">
                <a-radio :value="1">
                  ç»´ä¿®
                </a-radio>
                <a-radio :value="2">
                 ä¼‘班
                </a-radio>
              </a-radio-group>
            </a-form-item>
          </a-col>
        </a-row>

        <a-row :gutter="24">
          <a-col :span="12">
            <a-form-item label="开始时间" :labelCol="labelCol" :wrapperCol="wrapperCol">
@@ -39,15 +55,15 @@
            </a-form-item>
          </a-col>
        </a-row>
        <a-row :gutter="24">
          <a-col :span="12">
            <a-form-item v-show="this.mesag == 1" label="维修类型" :labelCol="labelCol" :wrapperCol="wrapperCol">
              <a-input :disabled="disableSubmit" :readOnly="readOnly" placeholder="请选择设备类型"
                                 :triggerChange="true"
                                 v-decorator="['mdcRepairType', validatorRules.mdcRepairType]"/>
            </a-form-item>
          </a-col>
        </a-row>
        <!--<a-row :gutter="24">-->
          <!--<a-col :span="12">-->
            <!--<a-form-item v-show="this.mesag == 1" label="维修类型" :labelCol="labelCol" :wrapperCol="wrapperCol">-->
              <!--<a-input :disabled="disableSubmit" :readOnly="readOnly" placeholder="请选择设备类型"-->
                                 <!--:triggerChange="true"-->
                                 <!--v-decorator="['mdcRepairType', validatorRules.mdcRepairType]"/>-->
            <!--</a-form-item>-->
          <!--</a-col>-->
        <!--</a-row>-->
      </a-form>
    </a-spin>
    <device-repair-list-model ref="deviceRepairListModel" @sendSelectionRows="getDeviceRows"></device-repair-list-model>
@@ -68,10 +84,11 @@
  import {
    duplicateCheck
  } from '@/api/api'
  import AFormItem from 'ant-design-vue/es/form/FormItem'

  export default {
    name: 'DeviceRepairModel',
    components: {DeviceRepairListModel,JDate},
    components: { AFormItem, DeviceRepairListModel,JDate},
    props: {},
    data() {
      return {
@@ -153,8 +170,9 @@

        disableSubmit: true,
        partCategoryCascade: [],
        cascadeDefaultValue: []
        cascadeDefaultValue: [],
      }

    },
    created() {
    },
@@ -288,7 +306,7 @@
                obj.then((res) => {
                  if (res.success) {
                    // that.$message.success("添加成功")
                    that.$notification.warning({
                    that.$notification.success({
                      message:'消息',
                      description:"添加成功"
                    });
@@ -347,7 +365,7 @@
      },
      checkboxChange(e) {
        this.checked = e.target.checked
      }
      },
    }
  }
</script>

 src/views/mdc/base/modules/deviceRepair/DeviceRepairModelAdd.vue

@@ -303,7 +303,7 @@
                obj.then((res) => {
                  if (res.success) {
                    // that.$message.success("添加成功")
                    that.$notification.warning({
                    that.$notification.success({
                      message:'消息',
                      description:"添加成功"
                    });

 src/views/mdc/base/modules/deviceRepair/DeviceRepairModelEdit.vue

@@ -281,7 +281,7 @@
                    if (res.success) {
                      // that.$message.success("修改成功")
                      // that.$message.success(res.message)
                      that.$notification.warning({
                      that.$notification.success({
                        message:'消息',
                        description:res.message
                      });
@@ -311,7 +311,6 @@
                that.confirmLoading = false

              }else{

                let obj
                if (!this.model.id) {
                  obj = postAction(this.url.add, formData)
@@ -326,7 +325,7 @@
                  if (res.success) {
                    // that.$message.success("修改成功")
                    // that.$message.success(res.message)
                    that.$notification.warning({
                    that.$notification.success({
                      message:'消息',
                      description:res.message
                    });

 src/views/mdc/base/modules/mdcDriveTypeParamConfig/MdcDriveTypeParamConfigForm.vue

@@ -15,11 +15,17 @@
              :wrapperCol="wrapperCol"
              prop="controlSystemType"
            >
              <j-dict-select-tag
                type="list"
              <!--<j-dict-select-tag-->
                <!--type="list"-->
                <!--v-model="model.controlSystemType"-->
                <!--dictCode="mdc_driveType"-->
                <!--placeholder="请选择控制系统类型"-->
              <!--/>-->
              <a-auto-complete
                v-model="model.controlSystemType"
                dictCode="mdc_driveType"
                :data-source="driveTypeList"
                placeholder="请选择控制系统类型"
                :filter-option="filterOption"
              />
            </a-form-model-item>
          </a-col>
@@ -104,6 +110,9 @@
      type: Boolean,
      default: false,
      required: false
    },
    driveTypeList:{
      type:Object
    }
  },
  data() {
@@ -181,7 +190,7 @@
          httpAction(httpurl, this.model, method).then((res) => {
            if (res.success) {
              // that.$message.success(res.message);
              that.$notification.warning({
              that.$notification.success({
                message:'消息',
                description:res.message
              });

 src/views/mdc/base/modules/mdcDriveTypeParamConfig/MdcDriveTypeParamConfigModal.vue

@@ -8,7 +8,7 @@
    :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
    @cancel="handleCancel"
    cancelText="关闭">
    <mdc-drive-type-param-config-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></mdc-drive-type-param-config-form>
    <mdc-drive-type-param-config-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" :driveTypeList="driveTypeList"></mdc-drive-type-param-config-form>
  </j-modal>
</template>

@@ -20,6 +20,7 @@
    components: {
      MdcDriveTypeParamConfigForm
    },
    props:['driveTypeList'],
    data () {
      return {
        title:'',