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

gaosp

2024-01-13 c53d6a6f30e8db258b9629dfae1f1fab759b9a86

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

 src/api/Api.js

@@ -13,6 +13,9 @@
    // å°è´¦ä¿å­˜
    accountCreate: '/account/create',
    accountUpdate: '/account/update',
    //设备类型
    deviceTypeCreate: '/devicetype/create',
    deviceTypeUpdate: '/devicetype/update',
    // è½¦é—´ å·¥æ®µä¸‹å•¦æ•°æ®
    getWsl: '/machine/workshopList',
    getPcl: '/machine/protocolList'
@@ -26,6 +29,10 @@
        url: '/component/pageQuery',
        method: 'POST'
    },
    deviceTypeQuery: {
        url: '/devicetype/pageQuery',
        method: 'POST'
    },
    maintainCreate: {
        url: '/maintain/save',
        method: 'POST'
@@ -109,6 +116,15 @@
export function accountUpdate(params) {
    return sendRequest(HttpConstants.accountUpdate, params)
}

// è®¾å¤‡ç±»åž‹ä¿å­˜
export function deviceTypeCreate(params) {
    return sendRequest(HttpConstants.deviceTypeCreate, params)
}
export function deviceTypeUpdate(params) {
    return sendRequest(HttpConstants.deviceTypeUpdate, params)
}

// 
export function getWsl(params) {
    return getData(HttpConstants.getWsl, params)

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,136 @@
<template>
  <div>
    <el-dialog
      :title="!dataForm.id ? '新建' : '编辑'"
      :close-on-click-modal="false"
      width="80%"
      :visible.sync="addVisible">
      <!-- æ·»åŠ å†…容-->
      <el-form  :model="dataForm" label-width="100px" ref="dataForm">
          <el-row :gutter="20">
          
          <el-col :xs="24":sm="6":md="6":lg="6":xl="6">
            <el-form-item label="名称" prop="name">
              <el-input v-model="dataForm.name" placeholder="名称" clearable></el-input>
            </el-form-item>
          </el-col>
          
        </el-row>
        
      </el-form>
      <!-- æŒ‰é’® -->
        <span slot="footer" class="dialog-footer">
        <el-button size="mini" @click="cancel">取消</el-button>
        <el-button size="mini" type="primary" @click="dataFormSubmit()">保存</el-button>
      </span>
    </el-dialog>
  </div>
</template>

<script>
  import { deviceTypeUpdate,deviceTypeCreate } from '@/api/Api'
  export default {
    props: ['addVisible','row'],
    data() {
      return {
        visible: false,
        dataForm: {
          id: 0, // title显示新增还是修改
          name: ''
        }
       
      }
    },
    watch: {
      addVisible: {
        handler (val) {
          if (val) {
              this.init()
          }
        },
        immediate: true
      }
    },
    created () {
        console.log('add create');
      this.init(this.row)
    },
    methods: {
      init(row) {
        if (this.$refs['dataForm']) {
          this.$refs['dataForm'].resetFields()
        }
        if (row !== undefined) {
          this.dataForm.id = row.id
          this.dataForm.name = row.name
          
        } else { 
            this.dataForm.id = '' 
        }
      },
      /* æŸ¥è¯¢ä½¿ç”¨éƒ¨é—¨*/
      cancel  () {
        this.$emit('close')
      },
      /* æäº¤*/
      dataFormSubmit() {
        if (this.dataForm.id === '') { // æ–°å¢ž
          deviceTypeCreate(this.dataForm).then(res => {
            this.$message({
              message: '新增成功',
              type: 'success',
              duration: 1500,
              onClose: () => {
                this.$emit('confirm')
                this.visible = false
              }
            })
          })
        } else {
          deviceTypeUpdate(this.dataForm).then(res => {
            this.$message({
              message: '修改成功',
              type: 'success',
              duration: 1500,
              onClose: () => {
                this.$emit('confirm')
                this.visible = false
              }
            })
          })
        }
      }
    }
  }
</script>

<style lang="scss">
  .el-form-item__content {
    .el-select,.el-input {
      width: 100%;
    }
  }
  .avatar-uploader .el-upload {
    border: 1px dashed #d9d9d9;
    border-radius: 6px;
    cursor: pointer;
    position: relative;
    overflow: hidden;
  }
  .avatar-uploader .el-upload:hover {
    border-color: #409EFF;
  }
  .avatar-uploader-icon {
    font-size: 28px;
    color: #8c939d;
    width: 178px;
    height: 178px;
    line-height: 178px;
    text-align: center;
  }
  .avatar {
    width: 178px;
    height: 178px;
    display: block;
  }
</style>

 src/container/deviceType/index.vue

@@ -6,55 +6,16 @@
-->
<template>
    <div class="maintenance">
        <div class="nav">工件信息</div>
        <div class="nav">设备类型管理</div>
        <List ref="list" :url="url">
            <template slot="search">
                <div class="item">
                    <span>零件号</span>
                    <el-select class="item-value" v-model="queryInfo.component" placeholder="请选择">
                        <el-option
                        v-for="item in componentList"
                        :key="item"
                        :label="item"
                        :value="item">
                        </el-option>
                    </el-select>
                    <span>名称</span>
                    <el-input class="item-value" v-model="queryInfo.name"></el-input>
                    
                </div>
                <div class="item">
                    <span>工序号</span>
                    <!-- <el-input class="item-value" v-model="query.no"></el-input> -->
                    <el-select class="item-value" v-model="queryInfo.precess" placeholder="请选择">
                        <el-option
                        v-for="item in precessList"
                        :key="item"
                        :label="item"
                        :value="item">
                        </el-option>
                    </el-select>
                </div>
                <div class="item">
                    <span>开始时间</span>
                    <!-- <el-input class="item-value" v-model="query.no"></el-input> -->
                    <el-date-picker
                        class="item-value"
                        v-model="queryInfo.timeBegin"
                        align="right"
                        value-format="yyyy-MM-dd"
                        type="date"
                        placeholder="选择日期">
                    </el-date-picker>
                </div>
                <div class="item">
                    <span>结束时间</span>
                    <el-date-picker
                        class="item-value"
                        v-model="queryInfo.timeEnd"
                        align="right"
                        value-format="yyyy-MM-dd"
                        type="date"
                        placeholder="选择日期">
                    </el-date-picker>
                </div>
               
                
                <div class="item">
                    <el-button type="primary" size="small" @click="query">查询</el-button>
                </div>
@@ -62,53 +23,52 @@
                    <el-button type="primary" size="small" @click="reset">重置</el-button>
                </div>
            </template>
            <template slot="columns">
                <el-table-column
                    prop="date"
                    label="机床名"
                    width="180">
                </el-table-column>
                <el-table-column
                    prop="component"
                    label="零件号"
                    width="180">
                </el-table-column>
                <el-table-column
                    prop="address"
                    label="工序号">
                </el-table-column>
                <el-table-column
                    prop="address"
                    label="加工时间">
                </el-table-column>
			
            <template slot="table-tool">
                <el-button type="primary" size="mini" @click="add">添加设备类型</el-button>
            </template>
			
            <template slot="columns">
                <el-table-column
                    prop="id"
                    label="ID"
                    width="180">
                </el-table-column>
                <el-table-column
                    prop="name"
                    label="名称"
                    width="180">
                </el-table-column>
                
            </template>
			
        </List>
        <manage-add-update v-if="addOrUpdateVisible" :addVisible="addOrUpdateVisible" @close="close" @confirm="confirm"
             :row="row"></manage-add-update>
    </div>
</template>
<script>
    import List from '../list/index.vue'
    import ManageAddUpdate from './Manage-add-update'
    import { getUrl } from '@/api/Api'
    export default {
        components: {
            List
            List,
            ManageAddUpdate
        },
        data () {
            return {
                url: '',
                queryInfo: {
                    timeBegin: '',
                    timeEnd: '',
                    precess: '',
                    component: ''
                    name: ''
                },
                precessList: [],
                componentList: []
                row: {},
                addOrUpdateVisible: false
            }
        },
        created () {
            this.url = getUrl('componentQuery')
            this.init()
            // this.getProtocolList()
            this.url = getUrl('deviceTypeQuery')
            //this.init()
        },
        methods: {
            reset () {
@@ -119,18 +79,23 @@
            query () {
                this.$refs.list.pageQuery(this.queryInfo)
            },
            changeTime (name,value) {
                console.log(name,value)
                this.queryInfo[name] = value
            },
            init () {
                this.$http.get('/component/processlist').then(res => {
                    this.precessList = res.data
                })
                this.$http.post('/component/complist').then(res => {
                    this.componentList = res.data
                })
            }
            add() {
                this.row = {id:''}
                this.addOrUpdateVisible = true
				
            },
            close() {
                this.addOrUpdateVisible = false
            },
            confirm() {
                this.query()
                this.close()
            },
            addOrUpdateHandle(row) {
                this.row = row
                this.addOrUpdateVisible = true
            }
            
        },
    }
</script>