| .env.development | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/utils/GlobalClickMixin.js | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/views/experiment/inspectionApplication/Viewdetails/index.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/views/inspectionManagement/commissionInspection/index.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/views/laboratory/ledger/index.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
.env.development
@@ -2,4 +2,4 @@ ENV = 'development' # base api VUE_APP_BASE_API = 'http://localhost:1234/' VUE_APP_BASE_API = 'http://192.168.65.96:1234/' src/utils/GlobalClickMixin.js
@@ -10,13 +10,13 @@ methods: { $_handleGlobalClick(event) { if (event.target.tagName === 'SPAN'||event.target.tagName==='BUTTON') { if(sessionStorage.getItem('user')===undefined&&sessionStorage.getItem('user')===null){ return; } let user=JSON.parse(sessionStorage.getItem('user')); if(user.account === 'admin'&&user.sessionLayerId === 'f5c8bcb7d5a0fd27e2323280f7e98cad'){ return; } // if(sessionStorage.getItem('user')===undefined&&sessionStorage.getItem('user')===null){ // return; // } // let user=JSON.parse(sessionStorage.getItem('user')); // if(user.account === 'admin'&&user.sessionLayerId === 'f5c8bcb7d5a0fd27e2323280f7e98cad'){ // return; // } // console.log(this.$router.currentRoute); // console.log(user.role.roleMenuList); // console.log(event.target.innerText); src/views/experiment/inspectionApplication/Viewdetails/index.vue
@@ -174,7 +174,7 @@ id: row.id, userProId: val }).then(res => { if (res.data) this.$message.success('责任人分配成功') this.$message.success('责任人分配成功') }) }, chooseEquipment(val, row) { @@ -182,7 +182,7 @@ id: row.id, equipmentId: val[2] }).then(res => { if (res.data) this.$message.success('设备分配成功') this.$message.success('设备分配成功') }) } } src/views/inspectionManagement/commissionInspection/index.vue
@@ -1,6 +1,6 @@ <template> <div> <div v-if="!showDetail"> <div> <div class="content-main"> <div class="top-bar"> <el-form ref="form" :inline="true" :model="searchData"> @@ -24,19 +24,19 @@ </el-form-item> </el-form> <el-form> <el-popover placement="left" width="350" trigger="click"> <el-popover placement="left" width="400" trigger="click"> <div class="vue_qr_div"> <el-row> <el-col> <el-input v-model="view" readonly size="medium" style="width: 250px;margin-right: 10px;"></el-input> <el-button size="small" type="primary" v-if="viewId==null" @click="viewDia=true">生成</el-button> <el-button size="small" type="primary" v-else-if="viewId!=null" @click="copy">复制</el-button> <el-button size="small" type="primary" @click="viewDia=true">生成</el-button> <el-button size="small" type="primary" @click="copy">复制</el-button> </el-col> </el-row> <el-row style="margin-top: 10px;"> <el-col v-if="viewId==null">当前链接已过期，请点击生成按钮重新生成</el-col> <el-col v-else-if="viewId!=null">当前链接将在{{(parseInt(viewTime)/60/60)>1?(parseInt(viewTime)/60/60).toFixed(1)+'小时':Math.round(parseInt(viewTime)/60)+'分钟'}}后过期</el-col> v-else-if="viewId!=null">当前链接将在{{(parseInt(viewTime2)/60/60)>1?(parseInt(viewTime2)/60/60).toFixed(1)+'小时':Math.round(parseInt(viewTime2)/60)+'分钟'}}后过期</el-col> </el-row> </div> <el-button slot="reference" class="rightBtn" type="primary" @click="goToaddCommision">新增委托</el-button> @@ -97,9 +97,6 @@ </div> </div> </div> </div> <div v-else> <router-view /> </div> <el-dialog title="链接时长设置" :visible.sync="viewDia" width="30%"> <div> @@ -228,7 +225,15 @@ view: null, viewId: null, viewTime: 1, viewTime2: 1, viewDia: false } }, watch:{ addReportDialog(newVal){ if(newVal === false){ this.resetForm("addInspectionForm"); } } }, created() { @@ -471,7 +476,7 @@ }).then(res => { this.view = `${this.vueIp}addCommision/${res.data.id}` this.viewId = res.data.id this.viewTime = res.data.time this.viewTime2 = res.data.time }) }, getViewId() { src/views/laboratory/ledger/index.vue
@@ -154,7 +154,7 @@ <span><i class="el-icon-edit" />验收日期：{{ equipmentDetail.acceptanceDate }}</span> </div> <div class="message-item"> <span><i class="el-icon-edit" />保管人：{{ equipmentDetail.name }}</span> <span><i class="el-icon-edit" />保管人：{{ equipmentDetail.userName }}</span> </div> <div class="message-item"> <span><i class="el-icon-edit" />是否支持数采：{{ equipmentDetail.whetherDataAcquisition == 1 ? '支持' : '不支持' @@ -777,7 +777,7 @@ this.$message.error('添加失败') } this.$message.success('添加成功') let d = this.nodeclicked let d = this.nodeclicked; this.nodeClickHandler(d); this.addDrawerVisible = false this.equipmentform = {} @@ -787,6 +787,8 @@ try { const res = await changeInstrument(this.equipmentform) this.$message.success('修改成功') let d = this.nodeclicked; this.nodeClickHandler(d); this.addDrawerVisible = false this.detailDrawer = false } catch (error) {
