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

This commit is contained in:
yuping
2022-12-14 15:31:20 +08:00
2 changed files with 672 additions and 626 deletions

File diff suppressed because it is too large Load Diff

View File

@@ -156,7 +156,7 @@
<div class="mbl_items12">
<div
class="i12_box1"
style="position:relative;"
style="position: relative"
v-for="(item, index) in detail.attach"
:key="index"
>
@@ -207,21 +207,43 @@
<div class="file_detail">
<div class="file_name">
<!-- http://111.231.196.214:12016/7.231.196.214:12016/7-1670486854017.jpg -->
<span style="color: #6f6f6f;width:200px;display:block;overflow:hidden;white-space:nowrap;text-overflow:ellipsis;position:absolute;top:4px;left:72px;">
{{ item.indexOf('-')!==-1?item.slice(item.lastIndexOf('/')+1,item.indexOf('-')) + item.slice(item.lastIndexOf('.')) :item }}
<span
style="
color: #6f6f6f;
width: 200px;
display: block;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
position: absolute;
top: 4px;
left: 72px;
"
>
{{
item.indexOf("-") !== -1
? item.slice(
item.lastIndexOf("/") + 1,
item.indexOf("-")
) + item.slice(item.lastIndexOf("."))
: item
}}
</span>
</div>
<div class="file_updata">
<div class="updatabox">
<div class="updatacolor"></div>
<div class="updataxq" style="right:-62px;">上传完成</div>
<div class="updataxq" style="right: -62px">
上传完成
</div>
</div>
<div class="upjd">
<span style="margin: auto 5px">100%</span>
</div>
</div>
</div>
<a :href="item" style="margin-left: 5px">下载</a>
</div>
</div>
</div>
@@ -262,134 +284,134 @@ export default defineComponent({
},
},
setup(props, { emit }) {
console.log(props);
console.log("props", props);
const state = reactive({
imgList: [],
options2222: [
{
title: '领导力',
value: '100',
selectable:false,
title: "领导力",
value: "100",
selectable: false,
children: [
{
title: '领导业务',
value: '1001',
title: "领导业务",
value: "1001",
},
{
title: '领导团队',
value: '1002',
title: "领导团队",
value: "1002",
},
{
title: '领导自我',
value: '1003',
title: "领导自我",
value: "1003",
},
],
},
{
title: '专业力',
value: '200',
selectable:false,
title: "专业力",
value: "200",
selectable: false,
children: [
{
title: '研发',
value: '2001',
title: "研发",
value: "2001",
},
{
title: '产品和解决方案',
value: '2002',
title: "产品和解决方案",
value: "2002",
},
{
title: '生产技术与制造',
value: '2003',
title: "生产技术与制造",
value: "2003",
},
{
title: '供应链',
value: '2004',
title: "供应链",
value: "2004",
},
{
title: '营销',
value: '2005',
title: "营销",
value: "2005",
},
{
title: '品质',
value: '2006',
title: "品质",
value: "2006",
},
{
title: '战略与企划',
value: '2007',
title: "战略与企划",
value: "2007",
},
{
title: '流程管理',
value: '2008',
title: "流程管理",
value: "2008",
},
{
title: '业绩管理',
value: '2009',
title: "业绩管理",
value: "2009",
},
{
title: '项目管理',
value: '20010',
title: "项目管理",
value: "20010",
},
{
title: '信息技术',
value: '20011',
title: "信息技术",
value: "20011",
},
{
title: '环境与安全',
value: '20012',
title: "环境与安全",
value: "20012",
},
{
title: '人力资源',
value: '20013',
title: "人力资源",
value: "20013",
},
{
title: '企业文化',
value: '20014',
title: "企业文化",
value: "20014",
},
{
title: '品牌',
value: '20015',
title: "品牌",
value: "20015",
},
{
title: '财务',
value: '20016',
title: "财务",
value: "20016",
},
{
title: '法务',
value: '20017',
title: "法务",
value: "20017",
},
{
title: '行政',
value: '20018',
title: "行政",
value: "20018",
},
{
title: '医工',
value: '20019',
}
title: "医工",
value: "20019",
},
],
},
{
title: '通用力',
value: '300',
selectable:false,
title: "通用力",
value: "300",
selectable: false,
children: [
{
title: '职业操守与道德',
value: '3001',
title: "职业操守与道德",
value: "3001",
},
{
title: '职业素养与技能',
value: '3002',
title: "职业素养与技能",
value: "3002",
},
{
title: '规章制度',
value: '3003',
title: "规章制度",
value: "3003",
},
],
}
]
],
},
],
});
console.log("detail", props.detail);
const filterTxt = (txt) => {
if (txt) {
return txt;
@@ -400,8 +422,8 @@ export default defineComponent({
const filterClassTxt = (txt) => {
let str = "-";
if (txt) {
for(let i =0; i<options2.value.length;i++){
for(let j=0;j<options2.value[i].children.length;j++){
for (let i = 0; i < options2.value.length; i++) {
for (let j = 0; j < options2.value[i].children.length; j++) {
if (String(options2.value[i].children[j].value) === String(txt)) {
str = options2.value[i].children[j].title;
}