FT/foton-laws-system-front
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop

Browse Source
This commit is contained in:
zhaokaiyao@91isoft.com
2021-08-04 14:48:15 +08:00
parent 64f8962b64 6439e5ea67
commit 60439cef5b
3 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/regulatoryRepository/nonConfomity/pages/historicalData.vue
+1 -1
View File
@@ -232,7 +232,7 @@
<div class="seeItem">{{historySeeForm.qaEngineer}}</div>
</el-form-item>
<el-form-item class="add-form-item" label="要求关闭时间:">
<div class="seeItem">{{historySeeForm.actualCloseTime.substring(0, 11)}}</div>
<div class="seeItem">{{historySeeForm.actualCloseTime ? historySeeForm.actualCloseTime.substring(0, 11) : '-'}}</div>
</el-form-item>
</el-form>
</div>
src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue
+13 -11
View File
@@ -269,7 +269,7 @@
<div class="seeItem">{{historySeeForm.qaEngineer}}</div>
</el-form-item>
<el-form-item class="add-form-item" label="计划关闭时间:">
<div class="seeItem">{{historySeeForm.planCloseTime.substring(0, 11)}}</div>
<div class="seeItem">{{historySeeForm.planCloseTime ? historySeeForm.planCloseTime.substring(0, 11) : '-'}}</div>
</el-form-item>
</el-form>
</div>
@@ -384,7 +384,7 @@
</div>
<div class="typeitems">
<div class="itemsLeft">验证时间:</div>
<div class="itemsRight">{{(item.validTime ? item.validTime.substring(0, 11): '')}}</div>
<div class="itemsRight">{{(item.validTime ? item.validTime.substring(0, 11) : '')}}</div>
</div>
<div class="typeitems">
<div class="itemsLeft">验证结果:</div>
@@ -592,16 +592,18 @@ export default {
this.$nextTick(() => {
const arr = []
let questionType = []
questionType = this.historySeeForm.quesType.split(',')
questionType.map((item) => {
this.optionList.map((opr) => {
if (item === opr.value) {
item = opr.label
arr.push(item)
}
if (this.historySeeForm.quesType) {
questionType = this.historySeeForm.quesType.split(',')
questionType.map((item) => {
this.optionList.map((opr) => {
if (item === opr.value) {
item = opr.label
arr.push(item)
}
})
})
})
this.historySeeForm.quesType = arr.toString()
this.historySeeForm.quesType = arr.toString()
}
})
},
//点击编辑按钮事件
src/sysConfig/index.js
+1 -1
View File
@@ -6,7 +6,7 @@
// 服务器地址
// const devIp = '10.96.10.171'
// const devInterfacePORT = '9999'
const devIp = '10.96.170.156'
const devIp = '127.0.0.1'
const devInterfacePORT = '9999'
// 云端端口号
const DEV_CLOUD_RES_INTERFACE_PORT = '7777'