| src/components/do/b1-inspect-order-plan/circuit-parameters1.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/components/do/b1-inspect-order-plan/circuit-parameters2.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/components/do/b1-report-preparation/order.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/components/view/b1-inspect-order-plan.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main.js | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
src/components/do/b1-inspect-order-plan/circuit-parameters1.vue
@@ -98,11 +98,6 @@ <el-input size="small" placeholder="端口" v-model="item.value" :disabled="state>1"></el-input> </div> </td> <td :rowspan="n.angleList.length+1"> <el-button icon="el-icon-minus" circle size="mini" type="danger" @click="deleteList(n.portList.length-1,n.portList)" :disabled="state>1" style="margin: 5px;"></el-button> <el-button icon="el-icon-plus" circle size="mini" type="primary" @click="addList(n.portList)" :disabled="state>1" style="margin: 5px;"></el-button> </td> </tr> <tr v-for="(item,index) in n.angleList" :key="index + 'eee'"> <td> @@ -115,7 +110,10 @@ </table> </div> </el-col> <el-col :span="2"> <el-col :span="1"> <el-input-number v-model="n.portNum" :min="1" :max="100" label="数量" size="small" @change="m=>changePort(m,n.portList)" :disabled="state>1"></el-input-number> </el-col> <el-col :span="1"> <div style="text-align: center;" :class="{red:n.result===0,green:n.result===1}">{{ n.result===0?'不合格':(n.result===1?'合格':(n.result===3?'不判定':(n.result===3?'不判定':'待定'))) }} </div> </el-col> @@ -149,11 +147,11 @@ <el-input size="small" placeholder="端口" v-model="item.value" :disabled="state>1"></el-input> </div> </td> <td :rowspan="n.angleList.length+1"> <!-- <td :rowspan="n.angleList.length+1"> <el-button icon="el-icon-minus" circle size="mini" type="danger" @click="deleteList(n.portList.length-1,n.portList)" :disabled="state>1" style="margin: 5px;"></el-button> <el-button icon="el-icon-plus" circle size="mini" type="primary" @click="addList(n.portList)" :disabled="state>1" style="margin: 5px;"></el-button> </td> </td> --> </tr> <tr v-for="(item,index) in n.angleList" :key="index + 'eee'"> <td> @@ -166,7 +164,10 @@ </table> </div> </el-col> <el-col :span="2"> <el-col :span="1"> <el-input-number v-model="n.portNum" :min="1" :max="100" label="数量" size="small" @change="m=>changePort(m,n.portList)" :disabled="state>1"></el-input-number> </el-col> <el-col :span="1"> <div style="text-align: center;" :class="{red:n.result===0,green:n.result===1}">{{ n.result===0?'不合格':(n.result===1?'合格':(n.result===3?'不判定':(n.result===3?'不判定':'待定'))) }} </div> </el-col> @@ -192,11 +193,11 @@ <el-input size="small" placeholder="频段" v-model="item.value" :disabled="state>1"></el-input> </div> </td> <td :rowspan="n.angleList.length+1"> <!-- <td :rowspan="n.angleList.length+1"> <el-button icon="el-icon-minus" circle size="mini" type="danger" @click="deleteList(n.portList.length-1,n.portList)" :disabled="state>1" style="margin: 5px;"></el-button> <el-button icon="el-icon-plus" circle size="mini" type="primary" @click="addList(n.portList)" :disabled="state>1" style="margin: 5px;"></el-button> </td> </td> --> </tr> <tr v-for="(item,index) in n.angleList" :key="index + 'eee'"> <td> @@ -209,7 +210,10 @@ </table> </div> </el-col> <el-col :span="2"> <el-col :span="1"> <el-input-number v-model="n.portNum" :min="1" :max="100" label="数量" size="small" @change="m=>changePort(m,n.portList)" :disabled="state>1"></el-input-number> </el-col> <el-col :span="1"> <div style="text-align: center;" :class="{red:n.result===0,green:n.result===1}">{{ n.result===0?'不合格':(n.result===1?'合格':(n.result===3?'不判定':'待定')) }} </div> </el-col> @@ -225,7 +229,7 @@ <el-col :span="2"> <div style="text-align: center;" v-html="n.tell"></div> </el-col> <el-col :span="16"> <el-col :span="17"> <div class="content" style="text-align: center;width: 100%;overflow-x: auto;"> <table border="1" cellpadding="10" class="thermal-table"> <tr> @@ -247,7 +251,7 @@ </table> </div> </el-col> <el-col :span="2"> <el-col :span="1"> <div style="text-align: center;" :class="{red:n.result===0,green:n.result===1}">{{ n.result===0?'不合格':(n.result===1?'合格':(n.result===3?'不判定':'待定')) }} </div> </el-col> @@ -475,7 +479,8 @@ equipName:n.equipName, equipValue:n.equipValue, frequency:n.frequency, sonLaboratory:item.sonLaboratory sonLaboratory:item.sonLaboratory, portNum:JSON.parse(n.value).length>0?JSON.parse(n.value)[0].length:4 } this.$set(obj,'portList', n.port?portList:[]) this.$set(obj,'angleList', n.angle?angleList:[]) @@ -528,6 +533,7 @@ item.result = '' // 赋值最差值 item.value = [] item.portNum = 4 if(item.inspectionItemSubclass.includes('耦合度')){ for(let i = 0;i<item.angleList.length;i++){ item.value.push(['']) @@ -649,9 +655,27 @@ } }) list.push(obj) }else if('端口'){ let obj = JSON.parse(JSON.stringify(list[0])); obj.value = null; list.push(obj) }else{ let obj = JSON.parse(JSON.stringify(list[0])); list.push(obj) } }, // 改变端口 changePort(num,list){ if(num>list.length){ for(let i = list.length;i<num;i++){ let obj = JSON.parse(JSON.stringify(list[0])); obj.value = null; list.push(obj) } }else if(num<list.length){ for(let i = list.length;i>num;i--){ list.pop() } } }, // 获取设备选项 id:为检验项id @@ -798,4 +822,37 @@ .green{ color: green; } >>>.el-input-number { display: inline-flex; flex-direction: column !important; line-height: 26px; } >>>.el-input-number__increase, >>>.el-input-number__decrease { width: 26px; height: 26px; } >>>.el-input-number__increase{ top: 36px; left: 10px; border: 0px; border-radius: 50%; background: #3A7BFA; color: #fff; } >>>.el-input-number__decrease{ top: -30px; border: 0px; border-radius: 50%; left: 10px; background: #F56C6C; color: #fff; } >>>.el-input-number .el-input{ width: 50px; } >>>.el-input-number .el-input__inner{ width: 50px; padding: 0; } </style> src/components/do/b1-inspect-order-plan/circuit-parameters2.vue
@@ -98,11 +98,6 @@ <el-input size="small" placeholder="端口" v-model="item.value" :disabled="state>1"></el-input> </div> </td> <td :rowspan="n.angleList.length+1"> <el-button icon="el-icon-minus" circle size="mini" type="danger" @click="deleteList(n.portList.length-1,n.portList)" :disabled="state>1" style="margin: 5px;"></el-button> <el-button icon="el-icon-plus" circle size="mini" type="primary" @click="addList(n.portList)" :disabled="state>1" style="margin: 5px;"></el-button> </td> </tr> <tr> <td> @@ -115,7 +110,10 @@ </table> </div> </el-col> <el-col :span="2"> <el-col :span="1"> <el-input-number v-model="n.portNum" :min="1" :max="100" label="数量" size="small" @change="m=>changePort(m,n.portList)" :disabled="state>1"></el-input-number> </el-col> <el-col :span="1"> <div style="text-align: center;" :class="{red:n.result===0,green:n.result===1}">{{ n.result===0?'不合格':(n.result===1?'合格':(n.result===3?'不判定':'待定')) }} </div> </el-col> @@ -149,11 +147,6 @@ <el-input size="small" placeholder="端口" v-model="item.value" :disabled="state>1"></el-input> </div> </td> <td :rowspan="n.angleList.length+1"> <el-button icon="el-icon-minus" circle size="mini" type="danger" @click="deleteList(n.portList.length-1,n.portList)" :disabled="state>1" style="margin: 5px;"></el-button> <el-button icon="el-icon-plus" circle size="mini" type="primary" @click="addList(n.portList)" :disabled="state>1" style="margin: 5px;"></el-button> </td> </tr> <tr v-for="(item,index) in n.angleList" :key="index + 'eee'"> <td> @@ -166,7 +159,10 @@ </table> </div> </el-col> <el-col :span="2"> <el-col :span="1"> <el-input-number v-model="n.portNum" :min="1" :max="100" label="数量" size="small" @change="m=>changePort(m,n.portList)" :disabled="state>1"></el-input-number> </el-col> <el-col :span="1"> <div style="text-align: center;" :class="{red:n.result===0,green:n.result===1}">{{ n.result===0?'不合格':(n.result===1?'合格':(n.result===3?'不判定':'待定')) }} </div> </el-col> @@ -354,7 +350,8 @@ equipName:n.equipName, equipValue:n.equipValue, frequency:n.frequency, sonLaboratory:item.sonLaboratory sonLaboratory:item.sonLaboratory, portNum:JSON.parse(n.value).length>0?JSON.parse(n.value)[0].length:4 } this.$set(obj,'portList', n.port?portList:[]) this.$set(obj,'angleList', n.angle?angleList:[]) @@ -408,6 +405,7 @@ item.angleList = JSON.parse(JSON.stringify(this.angleList)) // 赋值结论 item.result = '' item.portNum = 4 // 赋值最差值 item.value = [] if(item.inspectionItemSubclass.includes('互调')){ @@ -531,9 +529,27 @@ } }) list.push(obj) }else if(type=='端口'){ let obj = JSON.parse(JSON.stringify(list[0])); obj.value = null; list.push(obj) }else{ let obj = JSON.parse(JSON.stringify(list[0])); list.push(obj) } }, // 改变端口 changePort(num,list){ if(num>list.length){ for(let i = list.length;i<num;i++){ let obj = JSON.parse(JSON.stringify(list[0])); obj.value = null; list.push(obj) } }else if(num<list.length){ for(let i = list.length;i>num;i--){ list.pop() } } }, // 获取设备选项 id:为检验项id @@ -679,4 +695,37 @@ .green{ color: green; } >>>.el-input-number { display: inline-flex; flex-direction: column !important; line-height: 26px; } >>>.el-input-number__increase, >>>.el-input-number__decrease { width: 26px; height: 26px; } >>>.el-input-number__increase{ top: 36px; left: 10px; border: 0px; border-radius: 50%; background: #3A7BFA; color: #fff; } >>>.el-input-number__decrease{ top: -30px; border: 0px; border-radius: 50%; left: 10px; background: #F56C6C; color: #fff; } >>>.el-input-number .el-input{ width: 50px; } >>>.el-input-number .el-input__inner{ width: 50px; padding: 0; } </style> src/components/do/b1-report-preparation/order.vue
@@ -38,58 +38,56 @@ :append-to-body="true" :modal="!dialogVisible0" > <span>请选择委托编号为 {{currentInfo.entrustCode}} 要生成的数据</span> <el-card class="box-card" style="margin-top: 16px;" v-for="(item,index) in historyList" :key="index"> <div slot="header" style="display: flex;justify-content: space-between;"> <span>{{ item.laboratory }}</span> <!-- <el-checkbox v-model="item.checked"></el-checkbox> --> </div> <!-- <el-radio-group v-model="item.numValue" ref="radio"> <el-radio :label="m.value" v-for="(m,i) in item.arr" :key="i"><el-link type="primary" @click="lookDetail(item,m.value)">{{ m.label }}</el-link></el-radio> </el-radio-group> --> <el-table :data="item.insOrderUserList" border style="width: 100%" @selection-change="list=>handleSelectionChange(list,item.insOrderUserList)"> <el-table-column type="selection" width="55"> </el-table-column> <el-table-column prop="submitTime" label="提交日期" width="150"> </el-table-column> <el-table-column prop="submitUserName" label="提交人" width="90"> </el-table-column> <el-table-column prop="term" label="实验阶段" width="120"> </el-table-column> <el-table-column prop="note" label="实验操作" width="120"> </el-table-column> <el-table-column prop="tell" label="再次检验原因" width="120"> </el-table-column> <el-table-column fixed="right" label="操作" width="100"> <template slot-scope="scope"> <el-button @click="lookDetail(item,scope.row.num)" type="text" size="small">查看</el-button> </template> </el-table-column> </el-table> </el-card> <span>请选择委托编号为 <span style="color: #3A7BFA">{{currentInfo.entrustCode}}</span> 要生成的数据</span> <div style="max-height: 75vh;overflow-y: auto;"> <el-card class="box-card" style="margin-top: 16px;" v-for="(item,index) in historyList" :key="index"> <div slot="header" style="display: flex;justify-content: space-between;"> <span>{{ item.laboratory }}</span> </div> <el-table :data="item.insOrderUserList" border style="width: 100%" @selection-change="list=>handleSelectionChange(list,item.insOrderUserList)"> <el-table-column type="selection" width="55"> </el-table-column> <el-table-column prop="submitTime" label="提交日期" min-width="150"> </el-table-column> <el-table-column prop="submitUserName" label="提交人" min-width="90"> </el-table-column> <el-table-column prop="term" label="实验阶段" min-width="120"> </el-table-column> <el-table-column prop="note" label="实验操作" min-width="120"> </el-table-column> <el-table-column prop="tell" label="再次检验原因" min-width="120"> </el-table-column> <el-table-column fixed="right" label="操作" min-width="100"> <template slot-scope="scope"> <el-button @click="lookDetail(item,scope.row.num)" type="text" size="small">查看</el-button> </template> </el-table-column> </el-table> </el-card> </div> <span slot="footer" class="dialog-footer"> <el-button :loading="loading0" @click="handleNoCreate">不生成</el-button> <el-button type="primary" @click="handleCreate" :loading="loading1">生 成</el-button> src/components/view/b1-inspect-order-plan.vue
@@ -166,8 +166,8 @@ </el-col> <el-col :span="6"> <div class="center-title"> <el-button size="small" type="primary" @click="qrCodeVisible=true">扫码报检</el-button> <el-button size="small" type="primary" @click="exportVisible=true" style="margin-right: 16px;">出库</el-button> <el-button size="small" type="primary" @click="qrCodeVisible=true" v-if="selectWarehouse">扫码报检</el-button> <el-button size="small" type="primary" @click="exportVisible=true" style="margin-right: 16px;" v-if="selectWarehouse">出库</el-button> <span>总计任务数量:</span> <span>{{total}}</span> </div> @@ -335,32 +335,32 @@ <el-table-column prop="submitTime" label="提交日期" width="150"> min-width="150"> </el-table-column> <el-table-column prop="submitUserName" label="提交人" width="90"> min-width="90"> </el-table-column> <el-table-column prop="term" label="实验阶段" width="120"> min-width="120"> </el-table-column> <el-table-column prop="note" label="实验操作" width="120"> min-width="120"> </el-table-column> <el-table-column prop="tell" label="再次检验原因" width="120"> min-width="120"> </el-table-column> <el-table-column fixed="right" label="操作" width="100"> min-width="100"> <template slot-scope="scope"> <el-button @click="lookHistory(scope.row)" type="text" size="small">查看</el-button> </template> @@ -660,6 +660,7 @@ upLoadStorage: false, exportVisible: false, upLoadExport: false, selectWarehouse:false } }, created() { @@ -667,7 +668,6 @@ this.getTypeDicts() this.getInsStateDicts() this.getAuthorizedPerson() this.selectList() this.currentTime = getYearAndMonthAndDays() }, mounted() { @@ -892,6 +892,10 @@ if (power[i].menuMethod == 'scanInsOrderState') { this.scanInsOrderState = true } if (power[i].menuMethod == 'selectWarehouse') { this.selectWarehouse = true this.selectList() } } // if (!getInsProduct2) { // this.componentData.do.splice(5, 1) src/main.js
@@ -21,11 +21,11 @@ //本地 // Vue.prototype.LOCATIONVUE = "http://127.0.0.1:80"; // const javaApi = 'http://127.0.0.1:8001'; const javaApi = 'http://172.20.10.5:8001'; // const javaApi = 'http://172.20.10.5:8001'; // //通信测试库 // Vue.prototype.LOCATIONVUE = "http://10.1.13.77:8080"; // const javaApi = 'http://10.1.13.77:8001'; const javaApi = 'http://10.1.13.77:8001'; //云 // Vue.prototype.LOCATIONVUE = "http://114.132.189.42:8080";
