处理冲突

qushaowei

2024-01-31 142f2e839bf76eff614ca7c07c30b5da2745681a

处理冲突

 src/mixins/JeecgListMixin.js

@@ -358,11 +358,19 @@
              )
            })
          } else {
            this.$message.success(info.file.response.message || `${info.file.name} 文件上传成功`)
            // this.$message.success(info.file.response.message || `${info.file.name} 文件上传成功`)
            this.$notification.success({
              message:'消息',
              description:info.file.response.message || `${info.file.name} 文件上传成功`
            });
          }
          this.loadData()
        } else {
          this.$message.error(`${info.file.name} ${info.file.response.message}.`);
          // this.$message.error(`${info.file.name} ${info.file.response.message}.`);
          this.$notification.error({
            message:'消息',
            description:`${info.file.name} ${info.file.response.message}.`
          });
        }
      } else if (info.file.status === 'error') {
        this.loading = false;
@@ -384,7 +392,11 @@
            })
          }
        } else {
          this.$message.error(`文件上传失败: ${info.file.msg} `);
          // this.$message.error(`文件上传失败: ${info.file.msg} `);
          this.$notification.error({
            message:'消息',
            description:`文件上传失败: ${info.file.msg} `
          });
        }
      }
    },

 src/views/mdc/base/EquipmentList.vue

@@ -22,8 +22,8 @@

          <a-col :md="6" :sm="8">
            <a-form-item label="车间名称">
              <!--<a-input placeholder="请输入账号查询" v-model="queryParam.username"></a-input>-->
              <a-input placeholder="请输入车间名称" v-model="queryParam.productionName"></a-input>
              <!--<a-input placeholder="请输入车间名称" v-model="queryParam.productionName"></a-input>-->
              <a-tree-select v-model="queryParam.productionName" :treeData="workshopTreeData" placeholder="请选择车间"  tree-default-expand-all></a-tree-select>
            </a-form-item>
          </a-col>

@@ -38,6 +38,7 @@
    <!-- 操作按钮区域 -->
    <div class="table-operator" style="border-top: 5px">
      <a-button @click="handleAdd" type="primary" icon="plus" >添加设备</a-button>
      <a-button type="primary" icon="download" @click="handleExportXls('设备信息')">导出</a-button>
      <a-dropdown v-if="selectedRowKeys.length > 0">
        <a-menu slot="overlay" @click="handleMenuClick">
          <a-menu-item key="1">
@@ -147,6 +148,7 @@
  import UserRecycleBinModal from './modules/EquipmentList/UserRecycleBinModal'
  import JSuperQuery from '@/components/jeecg/JSuperQuery'
  import JThirdAppButton from '@/components/jeecgbiz/thirdApp/JThirdAppButton'
  import { queryProductionTreeList } from '@/api/api'
  import {mapActions} from 'vuex'

  export default {
@@ -256,10 +258,11 @@
          list: "/mdc/mdcEquipment/list",
          delete: "/mdc/mdcEquipment/delete",
          deleteBatch: "/mdc/mdcEquipment/deleteBatch",
          // exportXlsUrl: "/sys/user/exportXls",
          exportXlsUrl: "/mdc/mdcEquipment/exportXls",
          // importExcelUrl: "sys/user/importExcel",
        },
        isDepartType:''
        isDepartType:'',
        workshopTreeData:[]
      }
    },
    computed: {
@@ -269,6 +272,7 @@
    },
    created() {
      this.queryTreeData()
      this.getWorkshopListByApi()
    },
    methods: {
      ...mapActions(['QueryDepartTree']),
@@ -554,6 +558,12 @@
          this.loadData()
        }
      },

      getWorkshopListByApi(){
        queryProductionTreeList().then(res=>{
          if(res.success) this.workshopTreeData=res.result
        })
      }
    }

  }

 src/views/system/UserList.vue

@@ -535,10 +535,16 @@
        }
        frozenBatch({ids: id, status: status}).then((res) => {
          if (res.success) {
            that.$message.success(res.message);
            that.$notification.success({
              message:'消息',
              description:res.message
            });
            that.loadData();
          } else {
            that.$message.warning(res.message);
            that.$notification.warning({
              message:'消息',
              description:res.message
            });
          }
        });
      },

 src/views/system/WorkshopSignageManagement.vue

@@ -7,7 +7,7 @@
          <!-- 搜索区域 -->
          <a-form layout="inline" @keyup.enter.native="searchQuery">
            <a-row :gutter="24">
              <a-col :md="6" :sm="6">
              <a-col :md="8" :sm="8">
                <a-form-item label="车间名称" :labelCol="{ span: 5 }" :wrapperCol="{ span: 19}">
                  <a-input placeholder="" v-model="queryParam.workshopName"></a-input>
                </a-form-item>
@@ -375,16 +375,25 @@
     */
    handleDelete2: function (equipmentId) {
      if (!this.url.delete2) {
        this.$message.error('请设置url.delete2属性!')
        this.$notification.error({
          message:'消息',
          description:'请设置url.delete2属性!'
        });
        return
      }
      var that = this
      deleteAction(that.url.delete2, { workshopId: this.currentWorkshopId, equipmentId }).then((res) => {
        if (res.success) {
          that.$message.success(res.message)
          that.$notification.success({
            message:'消息',
            description:res.message
          });
          that.loadData2()
        } else {
          that.$message.warning(res.message)
          that.$notification.warning({
            message:'消息',
            description:res.message
          });
        }
      })
    },
@@ -446,9 +455,15 @@
      postAction(this.url.addDeviceInWorkshop, params).then((res) => {
        if (res.success) {
          this.loadData2()
          this.$message.success(res.message)
          this.$notification.success({
            message:'消息',
            description:res.message
          });
        } else {
          this.$message.warning(res.message)
          this.$notification.warning({
            message:'消息',
            description:res.message
          });
        }
      })
    },

 src/views/system/modules/PasswordModal.vue

@@ -105,11 +105,17 @@
            this.confirmLoading = true;
            let formData = Object.assign(this.model, values);
            changePassword(formData).then((res)=>{
              if(res.success){
                this.$message.success(res.message);
              if(res.success){;
                this.$notification.success({
                  message:'消息',
                  description:res.message
                });
                this.$emit('ok');
              }else{
                this.$message.warning(res.message);
                this.$notification.warning({
                  message:'消息',
                  description:res.message
                });
              }
            }).finally(() => {
              this.confirmLoading = false;

 src/views/system/modules/ProductionManager/ProductionEquipment.vue

@@ -254,10 +254,12 @@

        postAction(this.url.removeEquipmentForDepart,qs.stringify({productionId:this.productionId,equipmentId:equipmentId})).then((res)=>{
          if (res.success) {
            this.$message.warning(res.message)
            this.$notification.success({
              message:'消息',
              description:res.message
            });
            this.loadData(this.productionId);
          }else{
            // this.$message.warning(res.message)
            this.$notification.warning({
              message:'消息',
              description:res.message

 src/views/system/modules/RoleModal.vue

@@ -94,10 +94,16 @@
            }
            obj.then((res)=>{
              if(res.success){
                that.$message.success(res.message);
                that.$notification.success({
                  message:'消息',
                  description:res.message
                });
                that.$emit('ok');
              }else{
                that.$message.warning(res.message);
                that.$notification.warning({
                  message:'消息',
                  description:res.message
                });
              }
            }).finally(() => {
              that.confirmLoading = false;

 src/views/system/modules/UserRecycleBinModal.vue

@@ -145,7 +145,11 @@
              if(res.success){
                this.handleOk()
                this.handleClearSelection()
                this.$message.success(`还原 ${userIds.length} 个用户成功！`)
                // this.$message.success(`还原 ${userIds.length} 个用户成功！`)
                this.$notification.success({
                  message:'消息',
                  description:`还原 ${userIds.length} 个用户成功！`
                });
              }
            })
          }
@@ -166,9 +170,15 @@
              if (res.success) {
                this.loadData()
                this.handleClearSelection()
                this.$message.success(`彻底删除 ${userIds.length} 个用户成功！`)
                that.$notification.success({
                  message:'消息',
                  description:`彻底删除 ${userIds.length} 个用户成功！`
                });
              } else {
                that.$message.warning(res.message);
                that.$notification.warning({
                  message:'消息',
                  description:res.message
                });
              }
            });
          },

 src/views/system/modules/UserRoleModal.vue

@@ -146,13 +146,19 @@
        console.log("请求参数：",params);
        saveRolePermission(params).then((res)=>{
          if(res.success){
            that.$message.success(res.message);
            that.$notification.success({
              message:'消息',
              description:res.message
            });
            that.loading = false;
            if (exit) {
              that.close()
            }
          }else {
            that.$message.error(res.message);
            that.$notification.warning({
              message:'消息',
              description:res.message
            });
            that.loading = false;
            if (exit) {
              that.close()

 src/views/system/modules/WorkshopModal.vue

@@ -21,6 +21,9 @@
        <a-form-model-item label="设备编号颜色">
          <a-input type="color" v-model="model.equipmentIdColor"></a-input>
        </a-form-model-item>
        <a-form-model-item label="授权标识">
          <a-input placeholder="请输入授权标识" v-model="model.perms"/>
        </a-form-model-item>
      </a-form-model>
    </a-spin>
  </a-modal>
@@ -99,10 +102,16 @@
            }
            obj.then((res) => {
              if (res.success) {
                that.$message.success(res.message)
                that.$notification.success({
                  message:'消息',
                  description:res.message
                });
                that.$emit('ok')
              } else {
                that.$message.warning(res.message)
                that.$notification.warning({
                  message:'消息',
                  description:res.message
                });
              }
            }).finally(() => {
              that.confirmLoading = false