hz/ylst-pc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'ui-fix-from-master' into uat

Browse Source
This commit is contained in:
Zhx
2022-11-16 23:45:08 +08:00
parent 5b6b2ae8b0 d4e0c18e75
commit 30dd9025c6
33 changed files with 384 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
src/Layouts/BaseLayout.vue
View File

@@ -3,12 +3,12 @@
<div class="left"> <div class="left">
<i class="iconfont icon-xiangzuo-moren" <i class="iconfont icon-xiangzuo-moren"
@click="backHome"></i> @click="backHome"></i>
<a-popover trigger="hover"> <a-tooltip placement="right">
<template #content> <template #title>
<p>{{ project_name }}</p> {{ project_name }}
</template> </template>
<div class="question-name">{{ project_name }}</div> <div class="question-name">{{ project_name }}</div>
</a-popover> </a-tooltip>
</div> </div>
<div class="tab-container"> <div class="tab-container">
<div class="tab-item" <div class="tab-item"
@@ -18,7 +18,7 @@
:class="[tab.link === currentPath ? 'active' : '']" :class="[tab.link === currentPath ? 'active' : '']"
@click="toPage(tab.link, tab.title)"> @click="toPage(tab.link, tab.title)">
<span :class="tab.link === currentPath ? 'click' : 'click2'">{{ index+1 }}</span> <span :class="tab.link === currentPath ? 'click' : 'click2'">{{ index+1 }}</span>
<span style="font-size:18px">{{ tab.title }}</span> <span style="font-size:16px">{{ tab.title }}</span>
<span v-if="index!=3" <span v-if="index!=3"
style="width:27px;margin:0 10px;border-top: 1px dashed #C4C0C0;"></span> style="width:27px;margin:0 10px;border-top: 1px dashed #C4C0C0;"></span>
</div> </div>
@@ -227,6 +227,7 @@ const showLoading = computed(() => {
return false; return false;
}); });
const toPage = (path, title) => { const toPage = (path, title) => {
console.log(path, title)
showxiazai.value=null showxiazai.value=null
if(path!='/survey/planet'&&path!="/survey/schedule/recycle"){ if(path!='/survey/planet'&&path!="/survey/schedule/recycle"){
showxiazai.value=true showxiazai.value=true
@@ -419,22 +420,22 @@ onMounted(() => {
.click { .click {
display: flex; display: flex;
align-items: center; align-items: center;
padding-top:4.5px;
padding-bottom:4.5px;
justify-content: center; justify-content: center;
width: 18px; width: 20px;
height: 18px; height: 20px;
line-height: 9px; padding-top:5px;
padding-bottom:5px;
line-height: 10px;
border-radius: 60%; border-radius: 60%;
background-color: #70b936; background-color: #70b936;
color: #fff; color: #fff;
} }
.click2 { .click2 {
width: 18px; width: 20px;
height: 18px; height: 20px;
padding-top:4.5px; padding-top:5px;
padding-bottom:4.5px; padding-bottom:5px;
line-height: 9px; line-height: 10px;
border-radius: 60%; border-radius: 60%;
background-color: #f5f5f5; background-color: #f5f5f5;
color: black; color: black;
@@ -604,10 +605,12 @@ onMounted(() => {
margin-right: 6px; margin-right: 6px;
} }
.click { .click {
width: 18px; width: 20px;
height: 18px; height: 20px;
padding-top:5px;
padding-bottom:5px;
line-height: 10px;
font-size: 12px; font-size: 12px;
line-height: 9px;
border-radius: 60%; border-radius: 60%;
background-color: #70b936; background-color: #70b936;
color: #fff; color: #fff;
@@ -618,9 +621,11 @@ onMounted(() => {
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
width: 18px; width: 20px;
height: 18px; height: 20px;
line-height: 9px; padding-top:5px;
padding-bottom:5px;
line-height: 10px;
font-size: 12px; font-size: 12px;
border-radius: 60%; border-radius: 60%;
background-color: #f5f5f5; background-color: #f5f5f5;

144
src/font/demo_index.html
View File

@@ -54,6 +54,42 @@
<div class="content unicode" style="display: block;"> <div class="content unicode" style="display: block;">
<ul class="icon_lists dib-box"> <ul class="icon_lists dib-box">
<li class="dib">
<span class="icon iconfont">&#xe803;</span>
<div class="name">dakai</div>
<div class="code-name">&amp;#xe803;</div>
</li>
<li class="dib">
<span class="icon iconfont">&#xe802;</span>
<div class="name">a-bianzu3</div>
<div class="code-name">&amp;#xe802;</div>
</li>
<li class="dib">
<span class="icon iconfont">&#xe801;</span>
<div class="name">xuanxiangxianshi</div>
<div class="code-name">&amp;#xe801;</div>
</li>
<li class="dib">
<span class="icon iconfont">&#xe800;</span>
<div class="name">a-CombinedShape2</div>
<div class="code-name">&amp;#xe800;</div>
</li>
<li class="dib">
<span class="icon iconfont">&#xe7fe;</span>
<div class="name">xiazaiqi</div>
<div class="code-name">&amp;#xe7fe;</div>
</li>
<li class="dib">
<span class="icon iconfont">&#xe7ff;</span>
<div class="name">piliang</div>
<div class="code-name">&amp;#xe7ff;</div>
</li>
<li class="dib"> <li class="dib">
<span class="icon iconfont">&#xe7fc;</span> <span class="icon iconfont">&#xe7fc;</span>
<div class="name">分享</div> <div class="name">分享</div>
@@ -2844,9 +2880,9 @@
<pre><code class="language-css" <pre><code class="language-css"
>@font-face { >@font-face {
font-family: 'iconfont'; font-family: 'iconfont';
src: url('iconfont.woff2?t=1668575081960') format('woff2'), src: url('iconfont.woff2?t=1668613240810') format('woff2'),
url('iconfont.woff?t=1668575081960') format('woff'), url('iconfont.woff?t=1668613240810') format('woff'),
url('iconfont.ttf?t=1668575081960') format('truetype'); url('iconfont.ttf?t=1668613240810') format('truetype');
} }
</code></pre> </code></pre>
<h3 id="-iconfont-">第二步：定义使用 iconfont 的样式</h3> <h3 id="-iconfont-">第二步：定义使用 iconfont 的样式</h3>
@@ -2872,6 +2908,60 @@
<div class="content font-class"> <div class="content font-class">
<ul class="icon_lists dib-box"> <ul class="icon_lists dib-box">
<li class="dib">
<span class="icon iconfont icon-dakai1"></span>
<div class="name">
dakai
</div>
<div class="code-name">.icon-dakai1
</div>
</li>
<li class="dib">
<span class="icon iconfont icon-a-bianzu34"></span>
<div class="name">
a-bianzu3
</div>
<div class="code-name">.icon-a-bianzu34
</div>
</li>
<li class="dib">
<span class="icon iconfont icon-xuanxiangxianshi1"></span>
<div class="name">
xuanxiangxianshi
</div>
<div class="code-name">.icon-xuanxiangxianshi1
</div>
</li>
<li class="dib">
<span class="icon iconfont icon-a-CombinedShape21"></span>
<div class="name">
a-CombinedShape2
</div>
<div class="code-name">.icon-a-CombinedShape21
</div>
</li>
<li class="dib">
<span class="icon iconfont icon-xiazaiqi"></span>
<div class="name">
xiazaiqi
</div>
<div class="code-name">.icon-xiazaiqi
</div>
</li>
<li class="dib">
<span class="icon iconfont icon-piliang1"></span>
<div class="name">
piliang
</div>
<div class="code-name">.icon-piliang1
</div>
</li>
<li class="dib"> <li class="dib">
<span class="icon iconfont icon-fenxiang2"></span> <span class="icon iconfont icon-fenxiang2"></span>
<div class="name"> <div class="name">
@@ -7057,6 +7147,54 @@
<div class="content symbol"> <div class="content symbol">
<ul class="icon_lists dib-box"> <ul class="icon_lists dib-box">
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#icon-dakai1"></use>
</svg>
<div class="name">dakai</div>
<div class="code-name">#icon-dakai1</div>
</li>
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#icon-a-bianzu34"></use>
</svg>
<div class="name">a-bianzu3</div>
<div class="code-name">#icon-a-bianzu34</div>
</li>
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#icon-xuanxiangxianshi1"></use>
</svg>
<div class="name">xuanxiangxianshi</div>
<div class="code-name">#icon-xuanxiangxianshi1</div>
</li>
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#icon-a-CombinedShape21"></use>
</svg>
<div class="name">a-CombinedShape2</div>
<div class="code-name">#icon-a-CombinedShape21</div>
</li>
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#icon-xiazaiqi"></use>
</svg>
<div class="name">xiazaiqi</div>
<div class="code-name">#icon-xiazaiqi</div>
</li>
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#icon-piliang1"></use>
</svg>
<div class="name">piliang</div>
<div class="code-name">#icon-piliang1</div>
</li>
<li class="dib"> <li class="dib">
<svg class="icon svg-icon" aria-hidden="true"> <svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#icon-fenxiang2"></use> <use xlink:href="#icon-fenxiang2"></use>

30
src/font/iconfont.css
View File

@@ -1,8 +1,8 @@
@font-face { @font-face {
font-family: "iconfont"; /* Project id 3121635 */ font-family: "iconfont"; /* Project id 3121635 */
src: url('iconfont.woff2?t=1668575081960') format('woff2'), src: url('iconfont.woff2?t=1668613240810') format('woff2'),
url('iconfont.woff?t=1668575081960') format('woff'), url('iconfont.woff?t=1668613240810') format('woff'),
url('iconfont.ttf?t=1668575081960') format('truetype'); url('iconfont.ttf?t=1668613240810') format('truetype');
} }
.iconfont { .iconfont {
@@ -13,6 +13,30 @@
-moz-osx-font-smoothing: grayscale; -moz-osx-font-smoothing: grayscale;
} }
.icon-dakai1:before {
content: "\e803";
}
.icon-a-bianzu34:before {
content: "\e802";
}
.icon-xuanxiangxianshi1:before {
content: "\e801";
}
.icon-a-CombinedShape21:before {
content: "\e800";
}
.icon-xiazaiqi:before {
content: "\e7fe";
}
.icon-piliang1:before {
content: "\e7ff";
}
.icon-fenxiang2:before { .icon-fenxiang2:before {
content: "\e7fc"; content: "\e7fc";
} }

2
src/font/iconfont.js
View File

File diff suppressed because one or more lines are too long

42
src/font/iconfont.json
View File

@@ -5,6 +5,48 @@
"css_prefix_text": "icon-", "css_prefix_text": "icon-",
"description": "调研猩球前台icon", "description": "调研猩球前台icon",
"glyphs": [ "glyphs": [
{
"icon_id": "32896944",
"name": "dakai",
"font_class": "dakai1",
"unicode": "e803",
"unicode_decimal": 59395
},
{
"icon_id": "32896940",
"name": "a-bianzu3",
"font_class": "a-bianzu34",
"unicode": "e802",
"unicode_decimal": 59394
},
{
"icon_id": "32896935",
"name": "xuanxiangxianshi",
"font_class": "xuanxiangxianshi1",
"unicode": "e801",
"unicode_decimal": 59393
},
{
"icon_id": "32896934",
"name": "a-CombinedShape2",
"font_class": "a-CombinedShape21",
"unicode": "e800",
"unicode_decimal": 59392
},
{
"icon_id": "32896894",
"name": "xiazaiqi",
"font_class": "xiazaiqi",
"unicode": "e7fe",
"unicode_decimal": 59390
},
{
"icon_id": "32896920",
"name": "piliang",
"font_class": "piliang1",
"unicode": "e7ff",
"unicode_decimal": 59391
},
{ {
"icon_id": "32880564", "icon_id": "32880564",
"name": "分享", "name": "分享",

BIN
src/font/iconfont.ttf
View File

Binary file not shown.

BIN
src/font/iconfont.woff
View File

Binary file not shown.

BIN
src/font/iconfont.woff2
View File

Binary file not shown.

2
src/views/DataAnalyse/composables/use-generator-table-columns.js
View File

@@ -17,7 +17,7 @@ function includeSpecialType(type) {
} }
export default function useGeneratorTableColumns(columns, options = {}) { export default function useGeneratorTableColumns(columns, options = {}) {
debugger // debugger
options = { ...defaultOptions, ...options } options = { ...defaultOptions, ...options }
const tableHeaders = ref([]) const tableHeaders = ref([])
function flatData(columns) { function flatData(columns) {

2
src/views/DataAnalyse/index.vue
View File

@@ -160,7 +160,7 @@ export default defineComponent({
background-color: #ffffff; background-color: #ffffff;
height: calc(100vh - 146px); height: calc(100vh - 146px);
box-shadow: 0px 0px 6px 0px rgba(0,0,0,0.1); box-shadow: 0px 0px 6px 0px rgba(0,0,0,0.1);
border-radius: 0px 6px 6px 6px; border-radius: 6px 6px 6px 6px;
position: relative; z-index: 99; position: relative; z-index: 99;
} }
} }

9
src/views/DataAnalyse/kndiagram/questions/mxd.vue
View File

@@ -255,6 +255,7 @@ const columns = [
key: "status_str", key: "status_str",
slots: { customRender: "status_str" }, slots: { customRender: "status_str" },
align: "left", align: "left",
width:"30%",
}, },
{ {
title: "完成时间", title: "完成时间",
@@ -263,14 +264,14 @@ const columns = [
slots: { customRender: "finished_at" }, slots: { customRender: "finished_at" },
sorter: true, sorter: true,
align: "left", align: "left",
width: 200, width:"30%",
}, },
{ {
title: "操作", title: "操作",
key: "action", key: "action",
slots: { customRender: "action" }, slots: { customRender: "action" },
align: "left", align: "left",
width: 200, width:200,
}, },
]; ];
@@ -304,7 +305,7 @@ function handleSave(key) {
return; return;
} }
if (!(title && title.replaceAll(" ", "") && title.length < 20)) { if (!(title && title.replaceAll(" ", "") && title.length <= 20)) {
editableData.value[key] = cloneDeep( editableData.value[key] = cloneDeep(
tableSource.value.filter((item) => item.id === key)[0] tableSource.value.filter((item) => item.id === key)[0]
); );
@@ -449,10 +450,12 @@ onMounted(() => {
height: 80%; height: 80%;
display: flex; display: flex;
justify-content: center; justify-content: center;
margin:50px 0;
&-main { &-main {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
align-items: center; align-items: center;
text-align:center;
> p { > p {
margin: 0; margin: 0;
color: $yili-default-color; color: $yili-default-color;

12
src/views/ProjectManage/components/CreateSurvey.vue
View File

@@ -2,6 +2,7 @@
<a-form ref="formRef" :model="ruleForm" :rules="rules" :label-col="{ span: 4 }"> <a-form ref="formRef" :model="ruleForm" :rules="rules" :label-col="{ span: 4 }">
<a-form-item label="问卷名称" name="project_name"> <a-form-item label="问卷名称" name="project_name">
<a-input <a-input
style="border-radius: 4px;"
v-model:value="ruleForm.project_name" v-model:value="ruleForm.project_name"
@keydown.enter="onSubmit" @keydown.enter="onSubmit"
placeholder="请输入问卷名称" placeholder="请输入问卷名称"
@@ -44,8 +45,9 @@
</a-form-item> --> </a-form-item> -->
<a-form-item label="问卷标签" name="tags" v-if="isShow"> <a-form-item label="问卷标签" name="tags" v-if="isShow">
<a-select <a-select
v-model:value="ruleForm.tags" v-model:value="ruleForm.tags"
style="width: 100%" style="width: 100%;border-radius: 4px;"
mode="multiple" mode="multiple"
placeholder="搜索或新建标签" placeholder="搜索或新建标签"
@change="handleChange" @change="handleChange"
@@ -88,12 +90,13 @@
autoSize autoSize
:maxlength="150" :maxlength="150"
placeholder="请输入" placeholder="请输入"
style="border-radius: 4px;"
allowClear allowClear
/> />
</a-form-item> </a-form-item>
<a-form-item class="button" style="text-align: right"> <a-form-item class="button" style="text-align: right">
<a-button style="margin-right: 12px" type="default" @click="$emit('cancel')">取消</a-button> <a-button style="margin-right: 12px;border-radius: 4px;" type="default" @click="$emit('cancel')">取消</a-button>
<a-button type="primary" :loading="loading" @click="onSubmit">确定</a-button> <a-button type="primary" style="border-radius: 4px;" :loading="loading" @click="onSubmit">确定</a-button>
</a-form-item> </a-form-item>
</a-form> </a-form>
<a-modal v-model:visible="visibleTags" title="新建标签" :destroyOnClose="true" :footer="null"> <a-modal v-model:visible="visibleTags" title="新建标签" :destroyOnClose="true" :footer="null">
@@ -456,4 +459,7 @@ export default defineComponent({
::v-deep .ant-input-textarea-clear-icon { ::v-deep .ant-input-textarea-clear-icon {
margin: 4px 3px 0 0; margin: 4px 3px 0 0;
} }
.show-select:deep(.ant-select-selector){
border-radius:4px;
}
</style> </style>

8
src/views/ProjectManage/components/createFromTemplate.vue
View File

@@ -121,7 +121,7 @@ export default defineComponent({
pageSize: listSubData.per_page, pageSize: listSubData.per_page,
showSizeChanger: true, showSizeChanger: true,
pageSizeOptions: ['5', '10', '20', '30', '40'], pageSizeOptions: ['5', '10', '20', '30', '40'],
showTotal: (total) => `共 ${total} 条数据` // showTotal: (total) => `共 ${total} 条数据`
}) })
// 分页修改页码 // 分页修改页码
const pageChange = (page, filters, sorter, { currentDataSource }) => { const pageChange = (page, filters, sorter, { currentDataSource }) => {
@@ -161,3 +161,9 @@ export default defineComponent({
} }
}) })
</script> </script>
<style lang="scss" scoped>
:deep(.ant-table-pagination){
width: 100%;
text-align: center;
}
</style>

4
src/views/ProjectManage/fragment/TableList.vue
View File

@@ -84,7 +84,7 @@
<!-- <div v-for="it in record.tag" :key="it.id" style="display:inline-block;"> --> <!-- <div v-for="it in record.tag" :key="it.id" style="display:inline-block;"> -->
<a-tooltip <a-tooltip
v-if="record.tag.length > 2" v-if="record.tag.length > 2"
placement="right" placement="top"
:title="record.titles" :title="record.titles"
> >
<div style="display: flex; flex-direction: row"> <div style="display: flex; flex-direction: row">
@@ -110,7 +110,7 @@
</div> </div>
</template> </template>
<template #titles="{ record }"> <template #titles="{ record }">
<a-tooltip placement="right" :title="record.remarks || ''"> <a-tooltip :overlayStyle="{maxWidth:'600px'}" autoAdjustOverflow placement="topLeft" :title="record.remarks || ''">
<div> <div>
<span>{{ record.project_name }}</span> <span>{{ record.project_name }}</span>
<span class="table-sell" v-if="record.template_tag" <span class="table-sell" v-if="record.template_tag"

10
src/views/Publish/launch-center/components/basicInformation.vue
View File

@@ -71,6 +71,7 @@
:disabled="!iscreate" :disabled="!iscreate"
:maxlength="200" :maxlength="200"
:show-count="true" :show-count="true"
class="input-textarea"
> >
</a-textarea> </a-textarea>
</a-form-item> </a-form-item>
@@ -390,12 +391,12 @@ export default {
width: 328px; width: 328px;
height: 32px; height: 32px;
opacity: 1; opacity: 1;
border-radius: 5px; border-radius: 4px;
} }
.input-upload { .input-upload {
width: 103px; width: 103px;
height: 32px; height: 32px;
border-radius: 5px; border-radius: 4px;
font-size: 14px; font-size: 14px;
} }
.input-upload-show { .input-upload-show {
@@ -415,6 +416,11 @@ export default {
text-align: right; text-align: right;
} }
} }
.input-textarea {
:deep(textarea) {
border-radius: 4px;
}
}
.attachment { .attachment {
display: flex; display: flex;
justify-content: left; justify-content: left;

2
src/views/Publish/launch-center/components/shareLinks.vue
View File

@@ -4,7 +4,7 @@
<!-- <div class="title">分享链接</div> --> <!-- <div class="title">分享链接</div> -->
<div class="content"> <div class="content">
<div class="left"> <div class="left">
<a-input v-model:value="code" style="width: 580px"></a-input> <a-input v-model:value="code" style="width: 580px;border-radius: 4px;"></a-input>
<div class="copy-btn" @click="handleCopy" style="border-radius: 4px;"> <div class="copy-btn" @click="handleCopy" style="border-radius: 4px;">
<img class="copy-icon" :src="require('@/assets/img/publish/copy_icon.png')" alt="" /> <img class="copy-icon" :src="require('@/assets/img/publish/copy_icon.png')" alt="" />
<span style="height: 18px; line-height: 18px;margin-left: 6px">复制</span> <span style="height: 18px; line-height: 18px;margin-left: 6px">复制</span>

2
src/views/Publish/launch-center/launch-task/create.vue
View File

@@ -6,7 +6,7 @@
<sub-title>渠道应用信息</sub-title> <sub-title>渠道应用信息</sub-title>
<div class="customer-btn" style="text-align: right"> <div class="customer-btn" style="text-align: right">
<a-button type="primary" style="margin-right: 12px" @click="open" v-if="isCreate"> <a-button type="primary" style="margin-right: 12px" @click="open" v-if="isCreate">
<i class="iconfont icon-tianjia" style="margin-right: 6px;"></i> <i class="iconfont icon-tianjia" style="margin-right: 6px;position: relative;top: -1.5px;"></i>
<span style="vertical-align: top;">添加渠道应用</span> <span style="vertical-align: top;">添加渠道应用</span>
</a-button> </a-button>
</div> </div>

1
src/views/Publish/launch-center/launch-task/index.vue
View File

@@ -357,6 +357,7 @@ export default {
padding: 32px 24px; padding: 32px 24px;
background: #fff; background: #fff;
box-shadow: 0px 0px 6px 0px rgba(0,0,0,0.1); box-shadow: 0px 0px 6px 0px rgba(0,0,0,0.1);
border-radius: 6px 6px 6px 6px;
.title { .title {
font-size: 16px; font-size: 16px;
font-weight: bold; font-weight: bold;

2
src/views/Publish/link.vue
View File

@@ -681,7 +681,7 @@ onMounted(() => {
background: #fff; background: #fff;
box-shadow: 0px 0px 6px 0px rgba(0,0,0,0.1); box-shadow: 0px 0px 6px 0px rgba(0,0,0,0.1);
height: calc(100vh - 150px); height: calc(100vh - 150px);
border-radius: 0px 6px 6px 6px; border-radius: 6px 6px 6px 6px;
.title { .title {
font-size: 16px; font-size: 16px;
font-weight: bold; font-weight: bold;

8
src/views/TempMarket/Index.vue
View File

@@ -6,7 +6,7 @@
v-if="clickor==false" v-if="clickor==false"
@click="switchView('question',true)"> @click="switchView('question',true)">
<span class="icon iconfont title-main-item-icon" style="font-size:20px;">&#xe7e2;</span> <span class="icon iconfont title-main-item-icon" style="font-size:20px;">&#xe7e2;</span>
<span style="font-size: 16px">问卷库</span> <span style="font-size: 14px">问卷库</span>
<div class="title-main-item-line" <div class="title-main-item-line"
v-show="curView === 'question'"></div> v-show="curView === 'question'"></div>
</div> </div>
@@ -14,7 +14,7 @@
v-if="clickor==true" v-if="clickor==true"
@click="switchView('question',true)"> @click="switchView('question',true)">
<span class="icon iconfont title-main-item1-icon" style="font-size:20px;">&#xe7e2;</span> <span class="icon iconfont title-main-item1-icon" style="font-size:20px;">&#xe7e2;</span>
<span style="font-size: 16px">问卷库</span> <span style="font-size: 14px">问卷库</span>
<div class="title-main-item-line" <div class="title-main-item-line"
v-show="curView === 'question'"></div> v-show="curView === 'question'"></div>
</div> </div>
@@ -22,7 +22,7 @@
v-if="clickor==true" v-if="clickor==true"
@click="switchView('bank',false)"> @click="switchView('bank',false)">
<span class="icon iconfont title-main-item-icon" style="font-size:20px">&#xe7e1;</span> <span class="icon iconfont title-main-item-icon" style="font-size:20px">&#xe7e1;</span>
<span style="font-size: 16px">题库</span> <span style="font-size: 14px">题库</span>
<div class="title-main-item-line" <div class="title-main-item-line"
v-show="curView === 'bank'"></div> v-show="curView === 'bank'"></div>
</div> </div>
@@ -30,7 +30,7 @@
v-if="clickor==false" v-if="clickor==false"
@click="switchView('bank',false)"> @click="switchView('bank',false)">
<span class="icon iconfont title-main-item1-icon" style="font-size:20px">&#xe7e1;</span> <span class="icon iconfont title-main-item1-icon" style="font-size:20px">&#xe7e1;</span>
<span style="font-size: 16px">题库</span> <span style="font-size: 14px">题库</span>
<div class="title-main-item-line" <div class="title-main-item-line"
v-show="curView === 'bank'"></div> v-show="curView === 'bank'"></div>
</div> </div>

2
src/views/TempMarket/fragment/QuestionBank.vue
View File

@@ -44,6 +44,6 @@ export default {
.left{ .left{
border-right: 1px #EAEAEA solid; border-right: 1px #EAEAEA solid;
padding: 24px 0; padding: 24px 0;
border-radius: 6px 0 0 6px;
} }
</style> </style>

6
src/views/planetDesign/Design/components/BatchManageOptions.vue
View File

@@ -2,7 +2,7 @@
<div class="batch-banage-options"> <div class="batch-banage-options">
<a-button type="text" class="custom-button" @click="openModal"> <a-button type="text" class="custom-button" @click="openModal">
<div class="flex-align"> <div class="flex-align">
<i class="iconfont mr-5" style="font-size: 12px">&#xe702;</i> <i class="iconfont mr-5" >&#xe7ff;</i>
<span> <span>
<slot>批量选项</slot> <slot>批量选项</slot>
</span> </span>
@@ -218,4 +218,8 @@ export default {
.mr-5 { .mr-5 {
margin-right: 5px; margin-right: 5px;
} }
.flex-align{
display: flex;
align-items: center;
}
</style> </style>

2
src/views/planetDesign/Design/components/Logical.vue
View File

@@ -2,7 +2,7 @@
<div class="logical"> <div class="logical">
<a-button type="text" class="custom-button" @click="openModal"> <a-button type="text" class="custom-button" @click="openModal">
<div class="flex-align"> <div class="flex-align">
<i class="iconfont" style="font-size: 12px">&#xe6f8;</i> <i class="iconfont" >&#xe800;</i>
<span style="margin-left: 6px;margin-top:-3px">编辑逻辑</span> <span style="margin-left: 6px;margin-top:-3px">编辑逻辑</span>
<span v-if="logicNum !== 0">（{{ logicNum }}）</span> <span v-if="logicNum !== 0">（{{ logicNum }}）</span>
</div> </div>

2
src/views/planetDesign/Design/components/OptionShow.vue
View File

@@ -2,7 +2,7 @@
<div class="optShow"> <div class="optShow">
<a-button type="text" class="custom-button" @click="openModal"> <a-button type="text" class="custom-button" @click="openModal">
<div class="flex-align"> <div class="flex-align">
<i class="iconfont" style="font-size: 14px">&#xe750;</i> <i class="iconfont">&#xe801;</i>
<span style="margin-left: 6px">选项显示</span> <span style="margin-left: 6px">选项显示</span>
<span v-if="optShowNum !== 0">（{{ optShowNum }}）</span> <span v-if="optShowNum !== 0">（{{ optShowNum }}）</span>
</div> </div>

7
src/views/planetDesign/Design/components/RelatedOption.vue
View File

@@ -2,7 +2,8 @@
<div class="related"> <div class="related">
<a-button type="text" class="custom-button" @click="openModal"> <a-button type="text" class="custom-button" @click="openModal">
<div class="flex-align"> <div class="flex-align">
<img style="margin-top:-2px" :src="require('@/assets/img/guanlianxuanxiang.png')" /> <i class="iconfont"
>&#xe802;</i>
<span style="margin-left: 6px">{{ title }}</span> <span style="margin-left: 6px">{{ title }}</span>
<span v-if="info.associate.length !== 0">（{{ info.associate.filter((ass) => ass.type === type).length }}）</span> <span v-if="info.associate.length !== 0">（{{ info.associate.filter((ass) => ass.type === type).length }}）</span>
</div> </div>
@@ -828,4 +829,8 @@ export default {
:deep(.relate-html) { :deep(.relate-html) {
overflow: hidden; overflow: hidden;
} }
.flex-align {
display: flex;
align-items: center;
}
</style> </style>

2
src/views/planetDesign/Design/components/logicCopy.vue
View File

@@ -2,7 +2,7 @@
<div class="logical"> <div class="logical">
<a-button type="text" class="custom-button" @click="openModal"> <a-button type="text" class="custom-button" @click="openModal">
<div class="flex-align"> <div class="flex-align">
<i class="iconfont" style="font-size: 12px">&#xe6f8;</i> <i class="iconfont">&#xe800;</i>
<span style="margin-left: 6px;margin-top:-3px">编辑逻辑</span> <span style="margin-left: 6px;margin-top:-3px">编辑逻辑</span>
<span v-if="logicNum !== 0">（{{ logicNum }}）</span> <span v-if="logicNum !== 0">（{{ logicNum }}）</span>
</div> </div>

2
src/views/planetDesign/Design/fragement/QuestionMenuBar.vue
View File

@@ -221,6 +221,6 @@ export default {
text-align: center; text-align: center;
justify-content: space-between; justify-content: space-between;
align-items: center; align-items: center;
font-size: 16px; font-size: 14px;
} }
</style> </style>

6
src/views/planetDesign/Design/questions/choice/Choice.vue
View File

@@ -151,7 +151,7 @@
@click="addOptionHandle(optionList.length - 1)" @click="addOptionHandle(optionList.length - 1)"
> >
<div class="flex-align"> <div class="flex-align">
<i class="iconfont">&#xe689;</i> <i class="iconfont" >&#xe803;</i>
<span style="margin-left: 6px">添加选项</span> <span style="margin-left: 6px">添加选项</span>
</div> </div>
</a-button> </a-button>
@@ -454,4 +454,8 @@ export default {
background: #ffffff; background: #ffffff;
box-shadow: 0px 4px 20px 0px rgba(0, 0, 0, 0.2); box-shadow: 0px 4px 20px 0px rgba(0, 0, 0, 0.2);
} }
.flex-align{
display: flex;
align-items: center;
}
</style> </style>

4
src/views/planetDesign/Design/questions/matrix/Matrix.vue
View File

@@ -142,13 +142,13 @@
<template v-slot:footer> <template v-slot:footer>
<a-button type="text" class="custom-button" @click="addCol"> <a-button type="text" class="custom-button" @click="addCol">
<div class="flex-align"> <div class="flex-align">
<i class="iconfont">&#xe689;</i> <i class="iconfont">&#xe803;</i>
<span style="margin-left: 6px">添加列标签</span> <span style="margin-left: 6px">添加列标签</span>
</div> </div>
</a-button> </a-button>
<a-button type="text" class="custom-button" @click="addRow"> <a-button type="text" class="custom-button" @click="addRow">
<div class="flex-align"> <div class="flex-align">
<i class="iconfont">&#xe689;</i> <i class="iconfont">&#xe803;</i>
<span style="margin-left: 6px">添加行标签</span> <span style="margin-left: 6px">添加行标签</span>
</div> </div>
</a-button> </a-button>

1
src/views/planetDesign/Index.vue
View File

@@ -152,6 +152,7 @@ export default {
height: calc(100% - 26px); height: calc(100% - 26px);
position: relative; position: relative;
z-index: 99; z-index: 99;
border-radius: 6px;
} }
} }
</style> </style>

6
src/views/planetDesign/Logical/fragment/RandomListV2.vue
View File

@@ -41,6 +41,7 @@
<span class="title">随机题组</span> <span class="title">随机题组</span>
<span> <span>
<a-input <a-input
style=" border-radius:4px;"
placeholder="请输入题组名称" placeholder="请输入题组名称"
@blur="edit" @blur="edit"
v-model:value="itemj.title" v-model:value="itemj.title"
@@ -90,6 +91,7 @@
<span class="title" <span class="title"
><a-checkbox ><a-checkbox
:checked="item.is_select === 1" :checked="item.is_select === 1"
class="custom-checkbox"
@change=" @change="
(value) => { (value) => {
onchange(value, item); onchange(value, item);
@@ -101,6 +103,7 @@
<span> <span>
<a-input-number <a-input-number
class="w-100" class="w-100"
style=" border-radius:4px;"
v-model:value="item.num" v-model:value="item.num"
:max="item.list.length" :max="item.list.length"
@blur="edit" @blur="edit"
@@ -808,6 +811,9 @@ export default {
.w-100 { .w-100 {
width: 100%; width: 100%;
} }
.w-100:deep(.ant-select-selector){
border-radius:4px;
}
.right-10 { .right-10 {
margin-right: 10px; margin-right: 10px;
} }

2
src/views/planetDesign/redpacket/index.vue
View File

@@ -4,7 +4,7 @@
<div class="section-title">我的抽奖</div> <div class="section-title">我的抽奖</div>
<div style="width:100%;text-align:right;display:flex;justify-content:end;"> <div style="width:100%;text-align:right;display:flex;justify-content:end;">
<a-button type="primary" <a-button type="primary"
style="display:flex;align-items:center;" style="display:flex;align-items:center;border-radius:4px"
@click="add('1')"> @click="add('1')">
<i class="iconfont icon-tianjia" <i class="iconfont icon-tianjia"
style="font-size:10px;margin-right:6px;margin-top:1px;"></i> 新建抽奖 style="font-size:10px;margin-right:6px;margin-top:1px;"></i> 新建抽奖

99
src/views/schedule/recycle.vue
View File

@@ -5,54 +5,52 @@
<div class="section-title">回收进度</div> <div class="section-title">回收进度</div>
<div class="card-wrap"> <div class="card-wrap">
<div class="card" :style="from.num3 > 0 ? 'width:32.5%' : 'width:49%'"> <div class="card" :style="from.num3 > 0 ? 'width:32.5%' : 'width:49%'">
<div class="imgstyle" style="padding: 10px"> <div class="imgstyle" style="
background-color: rgb(255, 167, 67);
box-shadow:4px 4px 4px 4px rgba(255, 167, 67, 0.1);h-shadow:0px;v-shadow:0px">
<img <img
style="width: 30px; height: 30px" style="width: 40px; height: 40px"
src="@/assets/img/newly_increase_icon.png" src="@/assets/img/newly_increase_icon.png"
alt="" alt=""
/> />
</div> </div>
<div class="title"> <div class="title">
<div style="color: #5E5E5E;width:100px">今日回收量</div> <div style="color: #5E5E5E;width:100px">今日回收量</div>
<div style="margin-top: 19px; font-weight: 800; font-size: 28px"> <div style="margin-top: 10px; font-weight: 600; font-size: 28px">
{{ from.num1 }} {{ from.num1 }}
</div> </div>
</div> </div>
<img style="width:110px;height:90px;position: relative;top:14px;margin-right:44px" src="@/assets/img/jinrihuishou.png" alt="">
<!-- <i style="font-size: 40px; margin-right: 68px;color: #ffffff;line-height: 75px;" class="iconfont">&#xe7d1;</i> -->
</div> </div>
<div class="card" :style="from.num3 > 0 ? 'width:32.5%' : 'width:49%'"> <div class="card1" :style="from.num3 > 0 ? 'width:32.5%' : 'width:49%'">
<div class="imgstyle" style="background-color: rgb(78, 125, 255)"> <div class="imgstyle" style="background-color: rgb(78, 125, 255);box-shadow:4px 4px 4px 4px rgba(78, 125, 255, 0.1);h-shadow:0px;v-shadow:0px">
<img <img
style="width: 30px; height: 30px" style="width: 40px; height: 40px"
src="@/assets/img/data_count_icon.png" src="@/assets/img/data_count_icon.png"
alt="" alt=""
/> />
</div> </div>
<div class="title"> <div class="title">
<div style="color: #5E5E5E;;width:100px">完成回收总量</div> <div style="color: #5E5E5E;;width:100px">完成回收总量</div>
<div style="margin-top: 19px; font-weight: 800; font-size: 28px"> <div style="margin-top: 10px; font-weight: 600; font-size: 28px">
{{ from.num2 }} {{ from.num2 }}
</div> </div>
</div> </div>
<img style="width:110px;height:90px;position: relative;top:14px;margin-right:44px" src="@/assets/img/huishouzongliang.png" alt="">
<!-- <i style="font-size: 40px; margin-right: 68px;color: #ffffff;line-height: 75px;" class="iconfont">&#xe7d0;</i> -->
</div> </div>
<div class="card" v-if="from.num3 > 0"> <div class="card2" v-if="from.num3 > 0">
<div class="imgstyle" style="background-color: #2cd076"> <div class="imgstyle" style="background-color: #2cd076;
box-shadow:4px 4px 4px 4px rgba(44, 208, 118, 0.1);h-shadow:0px;v-shadow:0px">
<img <img
style="width: 30px; height: 30px" style="width: 40px; height: 40px"
src="@/assets/img/listicon.png" src="@/assets/img/listicon.png"
alt="" alt=""
/> />
</div> </div>
<div class="title"> <div class="title">
<div style="width:100px">发布数量</div> <div style="width:100px">发布数量</div>
<div style="margin-top: 15px; font-weight: 800; font-size: 28px"> <div style="margin-top: 10px; font-weight: 600; font-size: 28px">
{{ from.num3 }} {{ from.num3 }}
</div> </div>
</div> </div>
<img style="width:110px;height:90px;position: relative;top:14px;margin-right:44px" src="@/assets/img/fabushuliang.png" alt="">
</div> </div>
</div> </div>
</div> </div>
@@ -243,21 +241,72 @@ export default defineComponent({
justify-content: space-between; justify-content: space-between;
.card { .card {
display: flex; display: flex;
padding: 14px 20px; padding: 15px 20px;
padding-left: 68px; padding-left: 68px;
width: 31%; width: 31%;
// background: #fafafa; // background: #fafafa;
min-height: 100px; height: 100px;
border-radius: 6px; border-radius: 6px;
border: 1px rgb(150,150,150,0.3) solid;opacity: 1; border: 1px rgb(150,150,150,0.3) solid;opacity: 1;
.imgstyle { background-image:url("../../assets/img/jinrihuishou.png") ;
width: 50px; background-size:110px 90px;
height: 50px; background-repeat:no-repeat;
background-position:90% 100%;
right: 54px;
.imgstyle {width: 40px; height: 40px;
text-align: center;
margin: auto 0;
border-radius: 10px 10px 10px 10px;
}
.title {
width: 100%;
height: 100%;
margin: auto 30px;
}
}
.card1 {
display: flex;
padding: 15px 20px;
padding-left: 68px;
width: 31%;
// background: #fafafa;
height: 100px;
border-radius: 6px;
border: 1px rgb(150,150,150,0.3) solid;opacity: 1;
background-image:url("../../assets/img/huishouzongliang.png") ;
background-size:110px 90px;
background-repeat:no-repeat;
background-position:90% 100%;
right: 54px;
.imgstyle {width: 40px; height: 40px;
text-align: center;
margin: auto 0;
border-radius: 10px 10px 10px 10px;
}
.title {
width: 100%;
height: 100%;
margin: auto 30px;
}
}
.card2 {
display: flex;
padding: 15px 20px;
padding-left: 68px;
width: 31%;
// background: #fafafa;
height: 100px;
border-radius: 6px;
border: 1px rgb(150,150,150,0.3) solid;opacity: 1;
background-image:url("../../assets/img/fabushuliang.png") ;
background-size:110px 90px;
background-repeat:no-repeat;
background-position:90% 100%;
right: 54px;
.imgstyle {width: 40px; height: 40px;
text-align: center; text-align: center;
margin: auto 0; margin: auto 0;
background-color: rgb(255, 167, 67);
border-radius: 10px 10px 10px 10px; border-radius: 10px 10px 10px 10px;
padding: 10px;
} }
.title { .title {
width: 100%; width: 100%;
@@ -271,7 +320,7 @@ export default defineComponent({
height: 24px; height: 24px;
line-height: 24px; line-height: 24px;
margin-bottom: 24px; margin-bottom: 24px;
font-size: 18px; font-size: 16px;
margin-left: 12px; margin-left: 12px;
color: rgba(0, 0, 0, 0.85); color: rgba(0, 0, 0, 0.85);
font-weight: 600; font-weight: 600;
@@ -312,7 +361,7 @@ export default defineComponent({
height: 24px; height: 24px;
line-height: 24px; line-height: 24px;
margin-bottom: 24px; margin-bottom: 24px;
font-size: 18px; font-size: 16px;
color: rgba(0, 0, 0, 0.85); color: rgba(0, 0, 0, 0.85);
font-weight: 600; font-weight: 600;