dev_review
yujialong 8 months ago
parent 06dcc3b2d1
commit 27789601f6
  1. 10
      src/assets/css/main.css
  2. 2
      src/components/Header.vue
  3. 2
      src/components/quill/index.vue
  4. 2
      src/setting.js
  5. 44
      src/views/serve/projectAdd.vue

@ -270,16 +270,6 @@ li {
font-style: normal; font-style: normal;
} }
/* .link_upload .el-upload-list{
width: 30%;
} */
/*VueEditor*/
.ql-container {
min-height: 400px;
}
.ql-snow .ql-tooltip { .ql-snow .ql-tooltip {
transform: translateX(117.5px) translateY(10px) !important; transform: translateX(117.5px) translateY(10px) !important;
} }

@ -32,7 +32,6 @@ export default {
}, },
mounted () { mounted () {
this.getUserInfo() this.getUserInfo()
this.heartbeatDetection()
}, },
methods: { methods: {
toPerson () { toPerson () {
@ -101,6 +100,7 @@ export default {
id && this.$store.commit('SET_ACCOUNTID', id) id && this.$store.commit('SET_ACCOUNTID', id)
this.$store.commit('SET_USERNAME', this.userName) this.$store.commit('SET_USERNAME', this.userName)
this.initSocket(result.userAccount) this.initSocket(result.userAccount)
this.heartbeatDetection()
}).catch(err => { }) }).catch(err => { })
}, },
}, },

@ -185,7 +185,7 @@ export default {
children.padding = '0' children.padding = '0'
children.overflow = 'hidden' children.overflow = 'hidden'
children.height = '0' children.height = '0'
children.borderTop = '0' children.border = '0'
} }
}, },
beforeDestroy () { beforeDestroy () {

@ -14,7 +14,7 @@ if (isDev) {
sandPath = `http://${location.hostname}:9520` sandPath = `http://${location.hostname}:9520`
host = 'http://121.37.12.51/' host = 'http://121.37.12.51/'
// host = 'https://huorantech.cn/' // host = 'https://huorantech.cn/'
host = 'http://192.168.31.217:9000/' // host = 'http://192.168.31.217:9000/'
} else if (isPro) { } else if (isPro) {
jumpPath = 'https://judgment.huorantech.cn/' jumpPath = 'https://judgment.huorantech.cn/'
} }

@ -163,9 +163,9 @@
class="table" class="table"
stripe stripe
header-align="center" header-align="center"
use-virtual :use-virtual="isLc"
:max-height="400" :max-height="600"
:row-height="120" :row-height="60"
:border="false" :border="false"
@selection-change="handleSelectionProjectJudgment" @selection-change="handleSelectionProjectJudgment"
row-key="judgmentId" row-key="judgmentId"
@ -183,20 +183,21 @@
</u-table-column> </u-table-column>
<u-table-column prop="name" <u-table-column prop="name"
label="判分指标" label="判分指标"
align="center"></u-table-column> align="center"
show-overflow-tooltip
min-width="140"></u-table-column>
<u-table-column prop="name" <u-table-column prop="name"
label="判分点名称" label="判分点名称"
align="center"></u-table-column> align="center"
show-overflow-tooltip
min-width="140"></u-table-column>
<u-table-column label="实验要求" <u-table-column label="实验要求"
align="center" align="center"
width="600"> width="600">
<template slot-scope="scope"> <template slot-scope="scope">
<quill :border="true" <quill :readonly="true"
:readonly="true"
elseRead="true" elseRead="true"
v-model="scope.row.experimentalRequirements" v-model="scope.row.experimentalRequirements"
:minHeight="100"
:height="100"
:index="2" /> :index="2" />
</template> </template>
</u-table-column> </u-table-column>
@ -320,6 +321,7 @@
class="dialog-footer"> class="dialog-footer">
<el-button @click="closeJudgment"> </el-button> <el-button @click="closeJudgment"> </el-button>
<el-button type="primary" <el-button type="primary"
:loading="savingJud"
@click="saveJudgment"> </el-button> @click="saveJudgment"> </el-button>
</div> </div>
</el-dialog> </el-dialog>
@ -383,7 +385,8 @@ export default {
visibleLoading: false, // visibleLoading: false, //
listLoading: false,// listLoading: false,//
submiting: false, // submiting: false, //
updateTime: 0 updateTime: 0,
savingJud: false
}; };
}, },
computed: { computed: {
@ -406,7 +409,12 @@ export default {
this.$message.error("分配的数值已超过100"); this.$message.error("分配的数值已超过100");
} }
return score; return score;
} },
//
isLc () {
const systemId = +this.$route.query.systemId
return systemId === 11 || systemId === 12 || systemId === 19
},
}, },
watch: { watch: {
// , // ,
@ -681,10 +689,6 @@ export default {
this.dialogVisible = true; this.dialogVisible = true;
this.handleQueryJudgment(); this.handleQueryJudgment();
}, },
// id
isLc (systemId) {
return systemId == 11 || systemId == 12 || systemId == 19
},
handleQueryJudgment () { // handleQueryJudgment () { //
let { systemId } = this.projectManage; let { systemId } = this.projectManage;
this.$nextTick(() => { this.$nextTick(() => {
@ -699,7 +703,7 @@ export default {
}; };
if (systemId == 2 || systemId == 3) { if (systemId == 2 || systemId == 3) {
console.log("系统id:", systemId); console.log("系统id:", systemId);
} else if (this.isLc(systemId)) { } else if (this.isLc) {
// () // ()
this.rowKey = "lcId"; this.rowKey = "lcId";
this.getProcessClassData(params); this.getProcessClassData(params);
@ -752,6 +756,7 @@ export default {
}, },
saveJudgment () { // saveJudgment () { //
if (this.selectedJudgment.length) { if (this.selectedJudgment.length) {
this.savingJud = true
this.judgementpointsquery = ""; this.judgementpointsquery = "";
this.dialogVisible = false; this.dialogVisible = false;
let tempArr = this.selectedJudgment.map(i => { let tempArr = this.selectedJudgment.map(i => {
@ -763,6 +768,7 @@ export default {
e.sort = i + 1; e.sort = i + 1;
}); });
this.$nextTick(() => { this.$nextTick(() => {
this.savingJud = false
this.$refs.projectJudgementTable.clearSelection(); this.$refs.projectJudgementTable.clearSelection();
}); });
} else { } else {
@ -842,7 +848,7 @@ export default {
console.log(systemId); console.log(systemId);
} else if (systemId == 3) { } else if (systemId == 3) {
console.log(systemId); console.log(systemId);
} else if (this.isLc(systemId)) { } else if (this.isLc) {
// //
href = `${jumpPath}/#/Transaction?isView=true&systemId=${systemId}&lcId=${row.judgmentId}&token=${this.token}&referrer=${btoa(location.href)}`; href = `${jumpPath}/#/Transaction?isView=true&systemId=${systemId}&lcId=${row.judgmentId}&token=${this.token}&referrer=${btoa(location.href)}`;
} else { } else {
@ -855,7 +861,7 @@ export default {
console.log(systemId); console.log(systemId);
} else if (systemId == 3) { } else if (systemId == 3) {
console.log(systemId); console.log(systemId);
} else if (this.isLc(systemId)) { } else if (this.isLc) {
// //
href = `${jumpPath}/#/Transaction?isEdit=true&systemId=${systemId}&lcId=${row.judgmentId}&token=${this.token}&referrer=${btoa(location.href)}`; href = `${jumpPath}/#/Transaction?isEdit=true&systemId=${systemId}&lcId=${row.judgmentId}&token=${this.token}&referrer=${btoa(location.href)}`;
} else { } else {
@ -905,6 +911,6 @@ export default {
.main { .main {
overflow: auto; overflow: auto;
overflow-x: hidden; overflow-x: hidden;
height: calc(100vh - 152px); height: calc(100vh - 161px);
} }
</style> </style>
Loading…
Cancel
Save