update

gaoshp

2024-05-13 141dfa5427a0976d093ef83eec69ba8e1a9ab912

update

 src/views/console/workstation/Dialog.vue

@@ -8,7 +8,8 @@
                </el-col>
                <el-col :span="12">
                    <el-form-item label="工位编号" prop="code">
                        <el-input style="width: 240px" :disabled="form.id" v-model="form.code" placeholder="工位编号" clearable></el-input>
                        <el-input style="width: 240px" :disabled="form.id" v-model="form.code" placeholder="工位编号"
                            clearable></el-input>
                    </el-form-item>
                </el-col>
                <el-col :span="12">
@@ -26,13 +27,13 @@
                </el-col>
                <el-col :span="12">
                    <el-form-item label="所属工位组" prop="groupName">
                        <el-tree-select @node-click="nodeClick" v-model="form.groupName" :data="options.group"  :check-on-click-node="true"
                            style="width: 240px" />
                        <el-tree-select @node-click="nodeClick" v-model="form.groupName" :data="options.group"
                            :check-on-click-node="true" style="width: 240px" />
                    </el-form-item>
                </el-col>
                <el-col :span="12">
                    <el-form-item label="状态" prop="status">
                        <el-switch v-model="form.status" :active-value="1" :inactive-value="0"/>
                        <el-switch v-model="form.status" :active-value="1" :inactive-value="0" />
                    </el-form-item>
                </el-col>
                <el-col :span="24">
@@ -52,9 +53,10 @@
                    机器信息
                </el-col>
                <el-col :span="12" v-if="form.type == 0 && !form.id">
                    <el-form-item label="选择机器" prop="linkWay" >
                    <el-form-item label="选择机器" prop="linkWay">
                        <el-radio-group v-model="form.linkWay">
                            <el-radio v-for="item in options.linkWays" :key="item.value" :label="item.value">{{item.label}}</el-radio>
                            <el-radio v-for="item in options.linkWays" :key="item.value"
                                :label="item.value">{{ item.label }}</el-radio>
                        </el-radio-group>
                    </el-form-item>
                </el-col>
@@ -62,10 +64,11 @@
                    <!-- machineCode -->
                    <el-form-item label="机器编号" prop="machineId">
                        <!-- <el-input style="width: 240px" v-model="form.machineId" placeholder="机器编号" clearable></el-input> -->
                        <el-select v-if="!form.id" v-model="form.machineId" style="width: 240px" @change="change" clear filterable>
                            <el-option v-for="item in options.listnoband" :key="item.id" :label="item.machineName" :value="item.id"
                               >
                            {{ `${item?.machineCode}-${item?.machineName}-${item?.brand}`  }}</el-option>
                        <el-select v-if="!form.id" v-model="form.machineId" style="width: 240px" @change="change" clear
                            filterable>
                            <el-option v-for="item in options.listnoband" :key="item.id" :label="item.machineName"
                                :value="item.id">
                                {{ `${item?.machineCode}-${item?.machineName}-${item?.brand}` }}</el-option>
                        </el-select>
                        <el-input v-if="form.id" :disabled="form.id" v-model="form.machineName"></el-input>
                    </el-form-item>
@@ -84,16 +87,16 @@
                <el-col :span="12">
                    <el-form-item label="加工属性" prop="properties">
                        <el-select v-model="form.properties" style="width: 240px">
                            <el-option v-for="item in options.machining_type" :key="item.dictKey" :label="item.dictValue"
                                :value="item.dictKey" />
                            <el-option v-for="item in options.machining_type" :key="item.dictKey"
                                :label="item.dictValue" :value="item.dictKey" />
                        </el-select>
                    </el-form-item>
                </el-col>
                <el-col :span="12">
                    <el-form-item label="程序传输方式" prop="transmissionMethod">
                        <el-select v-model="form.transmissionMethod" style="width: 240px">
                            <el-option   label="FTP"  :value="1" />
                            <el-option   label="串口"  :value="2" />
                            <el-option label="FTP" :value="1" />
                            <el-option label="串口" :value="2" />
                        </el-select>
                    </el-form-item>
                </el-col>
@@ -115,15 +118,15 @@
                </el-col>
                <el-col :span="4">
                    <!-- <el-form-item label="工作台" prop="workbenchVOList"> -->
                        

                    <!-- </el-form-item> -->
                    <span>工作台</span>
                    

                </el-col>
                <el-col style="margin-bottom: 14px;">
                    <ul class="workbranch">
                        <li v-for="item in form.workbenchVOList">
                            <span>{{ item.sort}}</span>
                            <span>{{ item.sort }}</span>
                            <el-input v-model="item.name" style="width: 200px"></el-input>
                        </li>
                    </ul>
@@ -131,11 +134,10 @@
                </el-col>
                <el-col :span="12">
                    <el-form-item label="数据权限" prop="createDept">
                        <el-tree-select clearable @node-click="nodeClickTree" v-model="form.createDept" :data="tree"  :check-on-click-node="true" 
                            style="width: 240px">
                        <el-tree-select clearable @node-click="nodeClickTree" v-model="form.createDept" :data="tree"
                            :check-on-click-node="true" style="width: 240px">
                            <template #default="{ data: { title } }">
      {{ title }}</template
    >
                                {{ title }}</template>
                        </el-tree-select>
                    </el-form-item>
                </el-col>
@@ -224,13 +226,13 @@
                status: [
                    { required: true, message: '必填' }
                ],
                linkWay:[
                linkWay: [
                    { required: true, message: '必填' }
                ],
                machineId:[
                machineId: [
                    { required: true, message: '必填' }
                ],
                directoryId:[
                directoryId: [
                    { required: true, message: '必填' }
                ],
            },
@@ -293,18 +295,18 @@
        open(mode = 'add', params) {
            this.mode = mode;
            this.visible = true;
            

            if (params) {
                Object.keys(this.form).forEach(key => {
                    this.form[key] = params[key]
                })
                this.$HTTP.get(`/api/blade-cps/workstation/get?workstationId=${params.id}`).then(res => {
                    this.form =res?.data
                    this.form = res?.data
                    this.$HTTP.get(`/api/blade-cps/workstation-workbench/listWorkbench?workstationId=${params.id}`).then(res => {
                        this.form.workbenchVOList =res?.data?.workstationList || []
                        this.form.workbenchVOList = res?.data?.workstationList || []
                    })
                })
            }else {
            } else {
                this.form.id = ''
                Object.keys(this.form).forEach(key => {
                    this.form[key] = ''
@@ -342,14 +344,14 @@
            //可以和上面一样单个注入，也可以像下面一样直接合并进去
            //Object.assign(this.form, data)
        },
        change (id) {
            let row = this.options.listnoband.find(v=>v.id ==id)
            if (!row)  {
        change(id) {
            let row = this.options.listnoband.find(v => v.id == id)
            if (!row) {
                this.form.machineCode = ''
                this.form.machineId = ''
                this.form.machineName = ''

            }else {
            } else {
                this.form.machineCode = row.machineCode
                this.form.machineId = row.id
                this.form.machineName = row.machineName
@@ -359,7 +361,7 @@
            })
            console.log(row)
        },
        nodeClick (node) {
        nodeClick(node) {
            console.log(node)
            if (node.parentId == 0) return
            this.$nextTick(() => {
@@ -367,12 +369,12 @@
                this.form.groupName = node.name
            })
        },
        nodeClickTree (node) {
        nodeClickTree(node) {
            this.$nextTick(() => {
                this.form.createDept = node.id
            })
        },
        addWork () {
        addWork() {
            this.form.workbenchVOList.push({
                sort: this.form.workbenchVOList.length + 1,
                name: ''
@@ -386,20 +388,22 @@
.workbranch {
    list-style: none;
    padding-left: 50px;

    li {
        margin-top: 8px;

        span {
            display: inline-block;
            width: 25px;
        height: 25px;
        line-height: 25px;
        text-align: center;
        border-radius: 50%;
        background: #ccc;
        margin-right: 8px;
            height: 25px;
            line-height: 25px;
            text-align: center;
            border-radius: 50%;
            background: #ccc;
            margin-right: 8px;
        }
       
        


    }
}
</style>

 src/views/console/workstation/index.vue

@@ -77,7 +77,9 @@
                                            <p class="preview-title">工位信息</p>
                                            <div class="preview-content">
                                                <div class="img">
                                                    <img :src="machinePng" alt="">
                                                    <img v-if="!previewData.avatar" :src="machinePng" alt="">
                                                    <scUpload v-else disabled v-model="previewData.avatar" title="工位图片">
                                                    </scUpload>
                                                </div>
                                                <ul>
                                                    <li>工位编号 {{ previewData.code }}</li>