消息加台账导入

“linengliang”

2023-10-29 50706e13d5df93ceb541d39810df5845b5af7d71

消息加台账导入

 src/views/eam/EquipmentListOfAll.vue

@@ -77,20 +77,20 @@
        <a-row :gutter="24">
          <a-col :span="6">
            <a-form-item
              label="产线"
              label="工区"
              :labelCol="labelCol"
            :wrapperCol="wrapperCol"
            >
            <j-dict-select-tag
                allow-clear
                placeholder="请选择产线"
                placeholder="请选择工区"
                :triggerChange="true"
                dictCode="mom_base_work_center,name,id,del_flag!='1'"
                v-model="queryParam.workCenterId"
                dictCode="mom_base_area,name,id,del_flag!='1'"
                v-model="queryParam.factoryModelId"
              />
            </a-form-item>
          </a-col>
          <a-col :span="6">
          <!-- <a-col :span="6">
            <a-form-item
              label="车间"
              :labelCol="labelCol"
@@ -104,7 +104,7 @@
                v-model="queryParam.factoryModelId"
              />
            </a-form-item>
          </a-col>
          </a-col> -->
          <a-col :span="6">
            <a-form-item
              label="维护部门"
@@ -577,6 +577,12 @@
          align: "center",
          dataIndex: 'specificEquipment_dictText',
        },
        {
          title: '技术状态鉴定类型',
          align: "center",
          dataIndex: 'technologyStatusVerificationType_dictText',
        },
       
        // {
        //   title: '工区',
        //   align: "center",

 src/views/eam/EquipmentListOfCrane.vue

@@ -77,20 +77,20 @@
        <a-row :gutter="24">
          <a-col :span="6">
            <a-form-item
              label="产线"
              label="工区"
              :labelCol="labelCol"
            :wrapperCol="wrapperCol"
            >
            <j-dict-select-tag
                allow-clear
                placeholder="请选择产线"
                placeholder="请选择工区"
                :triggerChange="true"
                dictCode="mom_base_work_center,name,id,del_flag!='1'"
                v-model="queryParam.workCenterId"
                dictCode="mom_base_area,name,id,del_flag!='1'"
                v-model="queryParam.factoryModelId"
              />
            </a-form-item>
          </a-col>
          <a-col :span="6">
          <!-- <a-col :span="6">
            <a-form-item
              label="车间"
              :labelCol="labelCol"
@@ -104,7 +104,7 @@
                v-model="queryParam.factoryModelId"
              />
            </a-form-item>
          </a-col>
          </a-col> -->
          <a-col :span="6">
            <a-form-item
              label="维护部门"
@@ -577,6 +577,11 @@
          align: "center",
          dataIndex: 'specificEquipment_dictText',
        },
        {
          title: '技术状态鉴定类型',
          align: "center",
          dataIndex: 'technologyStatusVerificationType_dictText',
        },
        // {
        //   title: '工区',
        //   align: "center",

 src/views/eam/EquipmentListOfEnvProEquipment.vue

@@ -77,20 +77,20 @@
        <a-row :gutter="24">
          <a-col :span="6">
            <a-form-item
              label="产线"
              label="工区"
              :labelCol="labelCol"
            :wrapperCol="wrapperCol"
            >
            <j-dict-select-tag
                allow-clear
                placeholder="请选择产线"
                placeholder="请选择工区"
                :triggerChange="true"
                dictCode="mom_base_work_center,name,id,del_flag!='1'"
                v-model="queryParam.workCenterId"
                dictCode="mom_base_area,name,id,del_flag!='1'"
                v-model="queryParam.factoryModelId"
              />
            </a-form-item>
          </a-col>
          <a-col :span="6">
          <!-- <a-col :span="6">
            <a-form-item
              label="车间"
              :labelCol="labelCol"
@@ -104,7 +104,7 @@
                v-model="queryParam.factoryModelId"
              />
            </a-form-item>
          </a-col>
          </a-col> -->
          <a-col :span="6">
            <a-form-item
              label="维护部门"
@@ -580,6 +580,11 @@
          align: "center",
          dataIndex: 'specificEquipment_dictText',
        },
        {
          title: '技术状态鉴定类型',
          align: "center",
          dataIndex: 'technologyStatusVerificationType_dictText',
        },
        // {
        //   title: '工区',
        //   align: "center",

 src/views/eam/EquipmentListOfFilesCarousel.vue

@@ -77,20 +77,20 @@
        <a-row :gutter="24">
          <a-col :span="6">
            <a-form-item
              label="产线"
              label="工区"
              :labelCol="labelCol"
            :wrapperCol="wrapperCol"
            >
            <j-dict-select-tag
                allow-clear
                placeholder="请选择产线"
                placeholder="请选择工区"
                :triggerChange="true"
                dictCode="mom_base_work_center,name,id,del_flag!='1'"
                v-model="queryParam.workCenterId"
                dictCode="mom_base_area,name,id,del_flag!='1'"
                v-model="queryParam.factoryModelId"
              />
            </a-form-item>
          </a-col>
          <a-col :span="6">
          <!-- <a-col :span="6">
            <a-form-item
              label="车间"
              :labelCol="labelCol"
@@ -104,7 +104,7 @@
                v-model="queryParam.factoryModelId"
              />
            </a-form-item>
          </a-col>
          </a-col> -->
          <a-col :span="6">
            <a-form-item
              label="维护部门"
@@ -577,6 +577,11 @@
          align: "center",
          dataIndex: 'specificEquipment_dictText',
        },
        {
          title: '技术状态鉴定类型',
          align: "center",
          dataIndex: 'technologyStatusVerificationType_dictText',
        },
        // {
        //   title: '工区',
        //   align: "center",

 src/views/eam/EquipmentListOfPressureVessel.vue

@@ -77,20 +77,20 @@
        <a-row :gutter="24">
          <a-col :span="6">
            <a-form-item
              label="产线"
              label="工区"
              :labelCol="labelCol"
            :wrapperCol="wrapperCol"
            >
            <j-dict-select-tag
                allow-clear
                placeholder="请选择产线"
                placeholder="请选择工区"
                :triggerChange="true"
                dictCode="mom_base_work_center,name,id,del_flag!='1'"
                v-model="queryParam.workCenterId"
                dictCode="mom_base_area,name,id,del_flag!='1'"
                v-model="queryParam.factoryModelId"
              />
            </a-form-item>
          </a-col>
          <a-col :span="6">
          <!-- <a-col :span="6">
            <a-form-item
              label="车间"
              :labelCol="labelCol"
@@ -104,7 +104,7 @@
                v-model="queryParam.factoryModelId"
              />
            </a-form-item>
          </a-col>
          </a-col> -->
          <a-col :span="6">
            <a-form-item
              label="维护部门"
@@ -577,6 +577,11 @@
          align: "center",
          dataIndex: 'specificEquipment_dictText',
        },
        {
          title: '技术状态鉴定类型',
          align: "center",
          dataIndex: 'technologyStatusVerificationType_dictText',
        },
        // {
        //   title: '工区',
        //   align: "center",

 src/views/eam/EquipmentListOfProduct.vue

@@ -77,20 +77,20 @@
        <a-row :gutter="24">
          <a-col :span="6">
            <a-form-item
              label="产线"
              label="工区"
              :labelCol="labelCol"
            :wrapperCol="wrapperCol"
            >
            <j-dict-select-tag
                allow-clear
                placeholder="请选择产线"
                placeholder="请选择工区"
                :triggerChange="true"
                dictCode="mom_base_work_center,name,id,del_flag!='1'"
                v-model="queryParam.workCenterId"
                dictCode="mom_base_area,name,id,del_flag!='1'"
                v-model="queryParam.factoryModelId"
              />
            </a-form-item>
          </a-col>
          <a-col :span="6">
          <!-- <a-col :span="6">
            <a-form-item
              label="车间"
              :labelCol="labelCol"
@@ -104,7 +104,7 @@
                v-model="queryParam.factoryModelId"
              />
            </a-form-item>
          </a-col>
          </a-col> -->
          <a-col :span="6">
            <a-form-item
              label="维护部门"
@@ -577,6 +577,11 @@
          align: "center",
          dataIndex: 'specificEquipment_dictText',
        },
        {
          title: '技术状态鉴定类型',
          align: "center",
          dataIndex: 'technologyStatusVerificationType_dictText',
        },
        // {
        //   title: '工区',
        //   align: "center",

 src/views/eam/EquipmentListOfRide.vue

@@ -77,20 +77,20 @@
        <a-row :gutter="24">
          <a-col :span="6">
            <a-form-item
              label="产线"
              label="工区"
              :labelCol="labelCol"
            :wrapperCol="wrapperCol"
            >
            <j-dict-select-tag
                allow-clear
                placeholder="请选择产线"
                placeholder="请选择工区"
                :triggerChange="true"
                dictCode="mom_base_work_center,name,id,del_flag!='1'"
                v-model="queryParam.workCenterId"
                dictCode="mom_base_area,name,id,del_flag!='1'"
                v-model="queryParam.factoryModelId"
              />
            </a-form-item>
          </a-col>
          <a-col :span="6">
          <!-- <a-col :span="6">
            <a-form-item
              label="车间"
              :labelCol="labelCol"
@@ -104,7 +104,7 @@
                v-model="queryParam.factoryModelId"
              />
            </a-form-item>
          </a-col>
          </a-col> -->
          <a-col :span="6">
            <a-form-item
              label="维护部门"
@@ -577,6 +577,11 @@
          align: "center",
          dataIndex: 'specificEquipment_dictText',
        },
        {
          title: '技术状态鉴定类型',
          align: "center",
          dataIndex: 'technologyStatusVerificationType_dictText',
        },
        // {
        //   title: '工区',
        //   align: "center",

 src/views/eam/EquipmentListOfTester.vue

@@ -77,20 +77,20 @@
        <a-row :gutter="24">
          <a-col :span="6">
            <a-form-item
              label="产线"
              label="工区"
              :labelCol="labelCol"
            :wrapperCol="wrapperCol"
            >
            <j-dict-select-tag
                allow-clear
                placeholder="请选择产线"
                placeholder="请选择工区"
                :triggerChange="true"
                dictCode="mom_base_work_center,name,id,del_flag!='1'"
                v-model="queryParam.workCenterId"
                dictCode="mom_base_area,name,id,del_flag!='1'"
                v-model="queryParam.factoryModelId"
              />
            </a-form-item>
          </a-col>
          <a-col :span="6">
          <!-- <a-col :span="6">
            <a-form-item
              label="车间"
              :labelCol="labelCol"
@@ -104,7 +104,7 @@
                v-model="queryParam.factoryModelId"
              />
            </a-form-item>
          </a-col>
          </a-col> -->
          <a-col :span="6">
            <a-form-item
              label="维护部门"
@@ -577,6 +577,11 @@
          align: "center",
          dataIndex: 'specificEquipment_dictText',
        },
        {
          title: '技术状态鉴定类型',
          align: "center",
          dataIndex: 'technologyStatusVerificationType_dictText',
        },
        // {
        //   title: '工区',
        //   align: "center",

 src/views/eam/EquipmentListOfTruck.vue

@@ -77,20 +77,20 @@
        <a-row :gutter="24">
          <a-col :span="6">
            <a-form-item
              label="产线"
              label="工区"
              :labelCol="labelCol"
            :wrapperCol="wrapperCol"
            >
            <j-dict-select-tag
                allow-clear
                placeholder="请选择产线"
                placeholder="请选择工区"
                :triggerChange="true"
                dictCode="mom_base_work_center,name,id,del_flag!='1'"
                v-model="queryParam.workCenterId"
                dictCode="mom_base_area,name,id,del_flag!='1'"
                v-model="queryParam.factoryModelId"
              />
            </a-form-item>
          </a-col>
          <a-col :span="6">
          <!-- <a-col :span="6">
            <a-form-item
              label="车间"
              :labelCol="labelCol"
@@ -104,11 +104,11 @@
                v-model="queryParam.factoryModelId"
              />
            </a-form-item>
          </a-col>
          </a-col> -->
          <a-col :span="6">
            <a-form-item
              label="维护部门"
              :labelCol="labelCol"
            :labelCol="labelCol"
            :wrapperCol="wrapperCol"
            >
            <a-tree-select
@@ -577,6 +577,11 @@
          align: "center",
          dataIndex: 'specificEquipment_dictText',
        },
        {
          title: '技术状态鉴定类型',
          align: "center",
          dataIndex: 'technologyStatusVerificationType_dictText',
        },
        // {
        //   title: '工区',
        //   align: "center",

 src/views/eam/EquipmentListOfWeldingMachine.vue

@@ -77,20 +77,20 @@
        <a-row :gutter="24">
          <a-col :span="6">
            <a-form-item
              label="产线"
              label="工区"
              :labelCol="labelCol"
            :wrapperCol="wrapperCol"
            >
            <j-dict-select-tag
                allow-clear
                placeholder="请选择产线"
                placeholder="请选择工区"
                :triggerChange="true"
                dictCode="mom_base_work_center,name,id,del_flag!='1'"
                v-model="queryParam.workCenterId"
                dictCode="mom_base_area,name,id,del_flag!='1'"
                v-model="queryParam.factoryModelId"
              />
            </a-form-item>
          </a-col>
          <a-col :span="6">
          <!-- <a-col :span="6">
            <a-form-item
              label="车间"
              :labelCol="labelCol"
@@ -104,7 +104,7 @@
                v-model="queryParam.factoryModelId"
              />
            </a-form-item>
          </a-col>
          </a-col> -->
          <a-col :span="6">
            <a-form-item
              label="维护部门"
@@ -577,6 +577,11 @@
          align: "center",
          dataIndex: 'specificEquipment_dictText',
        },
        {
          title: '技术状态鉴定类型',
          align: "center",
          dataIndex: 'technologyStatusVerificationType_dictText',
        },
        // {
        //   title: '工区',
        //   align: "center",

 src/views/eam/modules/equipmentNew/EquipmentModal.vue

@@ -964,7 +964,7 @@
          { required: true, message: '请选择维护部门!' },
        ],
        useId: [
          { required: true, message: '请选择使用部门部门!' },
          { required: true, message: '请选择使用部门!' },
        ],
        specificEquipment: [
          { required: true, message: '请选择关键设备标识!' },
@@ -979,7 +979,7 @@
          { required: true, message: '请选择设备产线!' },
        ],
        factoryModelId: [
          { required: true, message: '请选择设备车间!' },
          { required: true, message: '请选择工区!' },
        ],
        warrantyStart: [
          { required: true, message: '请选择开始日期!' },

 src/views/user/Login.vue

@@ -45,6 +45,8 @@

import LoginAccount from './LoginAccount'
import LoginPhone from './LoginPhone'
import store from '@/store'
import { getAction } from '../../api/manage'

export default {
    components: {
@@ -52,7 +54,8 @@
      TwoStepCaptcha,
      // ThirdLogin,
      LoginAccount,
      LoginPhone
      LoginPhone,
      store
    },
    data () {
      return {
@@ -65,6 +68,9 @@
          key:"",
          iv:"",
        },
        url:{
          getPrimaryInfo:"/sys/sysAnnouncementSend/getPrimaryInfo"
        }
      }
    },
    created() {
@@ -113,6 +119,18 @@
          message: '欢迎',
          description: `${timeFix()}，欢迎回来`,
        });
        var userId = store.getters.userInfo.id;
        let that = this;
        getAction(this.url.getPrimaryInfo,{userId:userId}).then(res=>{
            if(res.success){
                for(var i=0;i<res.result.length;i++){
                  that.$notification.success({
                    message: '最新未读消息【'+res.result[i].msgCategory+'】',
                    description:res.result[i].msgContent,
                  });
                }
            }
        })
        // this.$refs.loginSelect.show(loginResult)
      },
      //登录后台失败
@@ -141,6 +159,7 @@
          message: '欢迎',
          description: `${timeFix()}，欢迎回来`,
        });
     
      },

      stepCaptchaSuccess () {