| src/assets/logo/Windows.png | 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/views/CNAS/resourceDemand/device/component/management.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/views/business/materialOrder/customsInspectionOrder.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/views/business/rawMaterialInspection/index.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/views/standard/standardLibrary/index.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
src/assets/logo/Windows.png
@@ -29,6 +29,7 @@ <div> <el-button size="small" type="primary" @click="dialogVisible2 = true">新增</el-button> <el-button size="small" type="primary" @click="handleDownOne">导出</el-button> <el-button size="small" type="primary" @click="showDownloadDialog">下载采集器</el-button> </div> </div> <div class="table" v-show="!showData"> @@ -384,6 +385,30 @@ </span> </el-dialog> <dataAcquisitionConfig v-if="showData" :deviceId="deviceId" /> <!-- 下载采集器弹框--> <el-dialog title="下载采集器" :visible.sync="downloadCollectorVisible" width="30%"> <el-row :gutter="12"> <el-col :span="12"> <el-card shadow="hover"> <div style="display: flex; justify-content: center; align-items: center;"> <div style="line-height: 12px"><el-image :src="imageSrc" fit="fill"></el-image></div> <div><el-link href="http://192.168.21.53:7001/collector/32.7z" type="primary">Win32位点此下载</el-link></div> </div> </el-card> </el-col> <el-col :span="12"> <el-card shadow="hover"> <div style="display: flex; justify-content: center; align-items: center;"> <div style="line-height: 12px"><el-image :src="imageSrc" fit="fill"></el-image></div> <div><el-link href="http://192.168.21.53:7001/collector/64.7z" type="primary">Win64位点此下载</el-link></div> </div> </el-card> </el-col> </el-row> </el-dialog> </div> </template> @@ -416,6 +441,8 @@ }, data() { return { imageSrc: require('@/assets/logo/Windows.png'), downloadCollectorVisible:false, dateFormat: 'yyyy-MM-dd', deviceId: '', fileTypeOptions: [ @@ -569,6 +596,9 @@ this.clickSidebar(this.clickNodeVal) }, methods: { showDownloadDialog(){ this.downloadCollectorVisible = true }, //分类 handleNotification(cate) { this.queryParams.largeCategory = cate src/views/business/materialOrder/customsInspectionOrder.vue
@@ -171,7 +171,8 @@ </el-form> </div> <div style="margin-bottom: 6px;margin-top: 6px"> <el-button v-show="active==1" :disabled="sampleList.length === 3" size="small" type="primary" @click="handleSplitCountNum">拆分</el-button> <el-button v-show="active==1" size="small" type="primary" @click="handleSplitCountNum">拆分</el-button> <el-button v-show="active==1" :disabled="sampleList.length<=1" size="small" type="danger" @click="handleDeleteSplitCountNum">删除拆分</el-button> </div> </div> @@ -954,6 +955,12 @@ this.templates = res.data }) }, //删除拆分行 handleDeleteSplitCountNum(){ this.count--; this.sampleList.pop() this.computationalPairing(this.sampleList.length) }, // 拆分 handleSplitCountNum () { this.sample.joinName = null src/views/business/rawMaterialInspection/index.vue
@@ -220,6 +220,9 @@ <el-row> <el-col :span="12"> <el-checkbox v-model="pushToMes"><span style="font-weight: bold">同步到MES</span></el-checkbox> <!-- <el-select v-model="splitOrderType" clearable size="mini" placeholder="请选择销售订单分类">--> <!-- <el-option v-for="(item,index) in orderTypeList" :value="item.dictValue" :label="item.dictLabel" :key="index"></el-option>--> <!-- </el-select>--> </el-col> <el-col :span="12"> <div style="width:100%;text-align: right;margin-bottom:5px"> @@ -301,6 +304,7 @@ data() { // 这里存放数据 return { splitOrderType: null, declareBatchObj:{ orderType:'' }, src/views/standard/standardLibrary/index.vue
@@ -20,8 +20,8 @@ " @node-click="handleNodeClick" @node-drop="handleDrop"> <div slot-scope="{ node, data }" class="custom-tree-node" style="width: calc(100% - 15px)"> <div style="display: flex;align-items: center;flex-wrap: nowrap;flex-direction: row;justify-content: space-between;"> <div style="width: calc(100% - 50px);text-overflow: ellipsis;white-space: nowrap;" <div :title="data.label" style="display: flex;align-items: center;flex-wrap: nowrap;flex-direction: row;justify-content: space-between;"> <div style="width: calc(100% - 50px);white-space: nowrap;text-overflow: ellipsis;" :style="`overflow:${(node.data.children === null || node.data.children === undefined)?'clip':'visible'}`" > <i :class="`node_i ${data.children != undefined @@ -41,46 +41,6 @@ </el-button> </div> </div> <!-- <div style="display: inline-block;width: calc(100% - 60px);text-overflow: ellipsis;white-space: nowrap;" :style="`overflow:${(node.data.children === null || node.data.children === undefined)?'clip':'visible'}`">--> <!-- <i :class="`node_i ${data.children != undefined--> <!-- ? data.code === '[1]'--> <!-- ? 'el-icon-folder-opened'--> <!-- : 'el-icon-folder'--> <!-- : 'el-icon-tickets'--> <!-- }`"></i>--> <!-- {{ data.label }}--> <!-- </div>--> <!-- <span v-if="(node.data.children === null || node.data.children === undefined)" style="text-align: right">--> <!-- <el-button style="width:20px" v-if="checkPermi(['standard:standardLibrary:delStandardTree'])" size="mini" type="text" @click.stop="editTreeName(node.data)">--> <!-- <i class="el-icon-edit"></i>--> <!-- </el-button>--> <!-- <el-button style="width:20px;margin-left: 0" size="mini" v-if="checkPermi(['standard:standardLibrary:delStandardTree'])" type="text" @click.stop="remove(node, data)">--> <!-- <i class="el-icon-delete"></i>--> <!-- </el-button>--> <!-- </span>--> <!-- <el-row style="width: 100%">--> <!-- <el-col :class="{ sort: node.level > 3 }" :span="19" :title="data.label" style="text-align: left">--> <!-- </el-col>--> <!-- <el-col v-if="--> <!-- checkPermi(['standard:standardLibrary:delStandardTree']) &&--> <!-- (node.data.children === null ||--> <!-- node.data.children === undefined)--> <!-- " :span="2" style="text-align: right">--> <!-- </el-col>--> <!-- <el-col v-if="--> <!-- checkPermi(['standard:standardLibrary:delStandardTree']) &&--> <!-- (node.data.children === null ||--> <!-- node.data.children === undefined)--> <!-- " :span="2" style="text-align: right">--> <!-- </el-col>--> <!-- </el-row>--> </div> </el-tree> </div>
