提交 735c67da authored 作者: 黎业扬's avatar 黎业扬

yang

上级 ae651a15
......@@ -6,14 +6,13 @@
</el-button>
</div>
<div style="margin-top: 20px;margin-left: 20px">
<!-- 旧代码 -->
<div v-if="0" style="margin-top: 20px;margin-left: 20px">
<h3 style="font-size: 30px">考核内容</h3>
<div v-for="(item,index) in targetList" style="font-size: 20px">
<div style="color: #00afff">{{"考核指标" + (index+1)}}</div>
<div style="margin-top: 20px"><span>考核标题:</span><span
style="margin-left: 20px">{{item.ttarget.targetName}}</span></div>
style="margin-left: 20px">{{item.ttarget.targetName}}111</span></div>
<div style="margin-top: 20px"><span>考核标准:</span><span
style="margin-left: 20px">{{item.ttarget.checkCriteria}}</span></div>
<div style="margin-top: 20px"><span>评分标准:</span><span
......@@ -60,13 +59,13 @@
<div style="margin-top: 20px;margin-left: 60px">
<div v-viewer v-for="image in item.tjobPicVedios" v-if="image.mediaType == '1'"
style="display: inline-block; width: 20%; margin-left: 10px;vertical-align: middle;text-align: center;">
<img
:src="image.url"
style="width: 100px;height: 100px; cursor:pointer"/>
<div style="margin-top: 20px" v-if="image.type == null || image.type =='' || image.type =='0' ">备注:{{image.remark}}</div>
<img :src="image.url" style="width: 100px;height: 100px; cursor:pointer" />
<div style="margin-top: 20px" v-if="image.type == null || image.type =='' || image.type =='0' ">备注00:{{image.remark}}</div>
<div style="margin-top: 20px" v-else>
<div :style="{'color':image.type ==2?'red':'blue'}">备注:{{image.remark}}</div>
</div>
<!-- 位置信息 -->
<div style="margin-top: 20px">GPS坐标: {{gps}}</div>
</div>
<div v-for="image in item.tjobPicVedios" v-if="image.mediaType == '2'"
......@@ -95,7 +94,8 @@
<div style="margin-top: 20px"><span>加分项数量:</span><span style="margin-left: 20px">{{addScoreCount}}</span></div>
<div style="margin-top: 20px"><span>减分项数量:</span><span style="margin-left: 20px">{{reduceScoreCount}}</span>
</div>
<div style="margin-top: 20px"><span>GPS坐标:</span><span style="margin-left: 20px">{{gps}}</span></div>
<!-- 位置信息 -->
<div style="margin-top: 20px">GPS坐标: <span style="margin-left: 20px">{{gps}}</span></div>
<div style="margin-top: 20px" slot="footer" class="dialog-footer">
<el-button :disabled="!(form.jobType == '1' && form.jobStatus == '2')" type="primary"
......@@ -270,6 +270,138 @@
</div>
<!-- 新代码 -->
<div style="margin-left:20px;">
<h3 style="font-size: 30px">考核内容</h3>
<!-- 初次考核列表内容 -->
<div style="font-size: 20px" v-for="(item, index) in targetList" :key="index">
<div style="color: #00afff">{{"考核指标" + (index+1)}}</div>
<div style="margin-top: 20px">
考核标题:<span style="margin-left: 20px">{{item.ttarget.targetName}}</span>
</div>
<div style="margin-top: 20px">
考核标准:<span style="margin-left: 20px">{{item.ttarget.checkCriteria}}</span>
</div>
<div style="margin-top: 20px">
评分标准:<span style="margin-left: 20px">{{item.ttarget.scoreCriteria}}</span>
</div>
<div style="margin-top: 20px">
所属层级:<span style="margin-left: 20px">{{item.ttarget.allTargetLevelName}}</span>
</div>
<div style="margin-top: 20px" v-if="item.ttarget.type=='1'">
加分项:<span style="margin-left: 20px">{{item.ttarget.plusReduceItem}}</span>
</div>
<div style="margin-top: 20px" v-if="item.ttarget.type=='2'">
减分项:<span style="margin-left: 20px">{{item.ttarget.plusReduceItem}}</span>
</div>
<div style="margin-top: 20px">
每项分值:<span style="margin-left: 20px">{{item.ttarget.plusReduceItemEvery}}</span>
</div>
<div style="margin-top: 20px">
得分:<span style="margin-left: 20px"></span>{{item.score}}
</div>
<!-- 是否重新调查 -->
<div style="margin-top: 20px">
<span>是否重新调查:</span>
<span style="margin-left: 20px">
<el-select v-model="item.isTrim" placeholder="请选择">
<el-option
v-for="item in isCheckOptions"
:key="item.value"
:label="item.label"
:value="item.value"
></el-option>
</el-select>
</span>
</div>
<!-- 选择原因 -->
<div style="margin-top: 20px">
<span>选择原因:</span>
<span style="margin-left: 20px">
<el-select :disabled="!(item.isTrim == 0)" v-model="item.reasonId" placeholder="请选择">
<el-option
v-for="item in isCheckReasonOptions"
:key="item.id"
:label="item.reasonContent"
:value="item.id">
</el-option>
</el-select>
</span>
</div>
<!-- 初考内容 -->
<div v-if="item.firstTJobPicVedios.length > 0" style="font-weight:bold;margin-top:20px">初考内容</div>
<div style="margin-top: 20px;margin-left: 60px">
<div v-viewer v-for="(image, index) in item.firstTJobPicVedios" :key="index"
class="img_video_box"
>
<img v-if="image.mediaType == '1'" :src="image.url" style="width: 200px;height: 200px; cursor:pointer" />
<video v-else style="width:200px;height:200px;" autoplay controls :src="image.url"></video>
<div style="color:blue;" v-if="image.type==1">(亮点)</div>
<div style="color:red;" v-if="image.type==2">(问题)</div>
<div style="margin-top:20px;" v-if="image.remark">备注:{{image.remark}}</div>
<div style="margin-top:20px;">位置信息:{{image.gpsAddress||'无'}}</div>
</div>
</div>
<!-- 整改内容 -->
<div v-if="item.rectifyTJobPicVedios.length > 0" style="font-weight:bold;margin-top:20px">整改内容</div>
<div style="margin-top: 20px;margin-left: 60px">
<div v-viewer v-for="(image, index) in item.rectifyTJobPicVedios" :key="index"
class="img_video_box"
>
<img v-if="image.mediaType == '1'" :src="image.url" style="width: 200px;height: 200px; cursor:pointer" />
<video v-else style="width:200px;height:200px;" autoplay controls :src="image.url"></video>
<div style="color:blue;" v-if="image.type==1">(亮点)</div>
<div style="color:red;" v-if="image.type==2">(问题)</div>
<div style="margin-top:20px;" v-if="image.remark">备注:{{image.remark}}</div>
<div style="margin-top:20px;">位置信息:{{image.gpsAddress||'无'}}</div>
</div>
</div>
<!-- 复查内容 -->
<div v-if="item.checkTJobPicVedios.length > 0" style="font-weight:bold;margin-top:20px">复查内容</div>
<div style="margin-top: 20px;margin-left: 60px">
<div v-viewer v-for="(image, index) in item.checkTJobPicVedios" :key="index"
class="img_video_box"
>
<img v-if="image.mediaType == '1'" :src="image.url" style="width: 200px;height: 200px; cursor:pointer" />
<video v-else style="width:200px;height:200px;" autoplay controls :src="image.url"></video>
<div style="color:blue;" v-if="image.type==1">(亮点)</div>
<div style="color:red;" v-if="image.type==2">(问题)</div>
<div style="margin-top:20px;" v-if="image.remark">备注:{{image.remark}}</div>
<div style="margin-top:20px;">位置信息:{{image.gpsAddress||'无'}}</div>
</div>
</div>
<el-divider><span style="color:#ccc;">指标分割线</span></el-divider>
</div>
<!-- 打回/完结 -->
<div style="font-size: 20px;margin:50px 0">
<div style="margin-top: 20px">
加分项数量:<span style="margin-left: 20px">{{addScoreCount}}</span>
</div>
<div style="margin-top: 20px">
减分项数量:<span style="margin-left: 20px">{{reduceScoreCount}}</span>
</div>
<div style="margin-top: 20px" slot="footer" class="dialog-footer">
<el-button
:disabled="!(form.jobType == '1' && form.jobStatus == '2')"
type="primary"
@click="handleRollbackJob"
>打回任务</el-button>
<el-button
:disabled="!(form.jobType == '1' && form.jobStatus == '2')"
type="primary"
@click="handleAudit"
>设为完结</el-button>
</div>
</div>
</div>
</div>
</template>
......@@ -361,15 +493,24 @@
item.isTrim = item.isTrim == 0 ? '是' : '否'
})
this.targetList = res.data.firstTJobTargets;
console.log('考核内容:',this.targetList)
this.resetTargetList = res.data.resetTJobTargets;
this.rectifyList = res.data.rectifyList;
this.checkList = res.data.checkList;
this.firstList = res.data.firstList;
// this.rectifyList = res.data.rectifyList;
// this.checkList = res.data.checkList;
// this.firstList = res.data.firstList;
// 获取初考内容
// this.firstList = res.data.firstTJobTargets[0].firstTJobPicVedios
// 获取整改内容
// this.rectifyList = res.data.firstTJobTargets[0].rectifyTJobPicVedios
// 获取复查内容
// this.checkList = res.data.firstTJobTargets[0].checkTJobPicVedios
this.addScoreCount = res.data.addScoreCount;
this.reduceScoreCount = res.data.reduceScoreCount;
this.gps = res.data.gps;
this.checkName = res.data.checkName;
this.checkTime = res.data.checkTime;
// this.checkTime = res.data.checkTime;
});
//获取原因库
......@@ -440,12 +581,12 @@
</script>
<style scoped>
/*.video-js .vjs-icon-placeholder {*/
/* width: 80%;*/
/* height: 80%;*/
/* display: block;*/
/*}*/
/* .video-player {
width: 50%;
} */
.img_video_box{
width:20%;
display: inline-block;
margin-left:10px;
vertical-align:middle;
text-align:center;
margin-top: 20px;
}
</style>
......@@ -38,11 +38,12 @@ module.exports = {
// detail: https://cli.vuejs.org/config/#devserver-proxy
[process.env.VUE_APP_BASE_API]: {
// target: `http://localhost:7788`,
// target: `http://152.136.125.222:8095/investigation`, //正式
target: 'https://faces.diaosaas.com/investigation', //测试
// target: `http://152.136.125.222:8095/investigation`,
// target: 'https://faces.diaosaas.com/investigation', //测试
target: 'https://mini.sharpenresearch.net.cn/investigation', //正式
changeOrigin: true,
pathRewrite: {
['^' + process.env.VUE_APP_BASE_API]: ''
['^' + process.env.VUE_APP_BASE_API]: ''
}
}
},
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论