-
+
@@ -31,6 +35,9 @@ export default {
const copyConfig = computed(() => {
return reactive(JSON.parse(JSON.stringify(props.config)));
});
+ const disableUpdateBtn = computed(() => {
+ return props.config.permissions?.disable_update || false;
+ });
const title = computed(() => {
const type = copyConfig.value?.config.quick_type || 0;
const str =
@@ -42,6 +49,7 @@ export default {
};
return {
copyConfig,
+ disableUpdateBtn,
title,
switchChange,
};
@@ -62,6 +70,13 @@ export default {
display: flex;
align-items: center;
justify-content: space-between;
+ &-disable {
+ color: #8c8c8c;
+ }
+ &::v-deep .ant-switch-disabled {
+ background-color: #d5ebc3;
+ opacity: 1;
+ }
}
&-label {
font-weight: bold;
diff --git a/src/views/planetDesign/Design/questions/choice/Choice.vue b/src/views/planetDesign/Design/questions/choice/Choice.vue
index b9ffabde..6d496339 100644
--- a/src/views/planetDesign/Design/questions/choice/Choice.vue
+++ b/src/views/planetDesign/Design/questions/choice/Choice.vue
@@ -139,6 +139,7 @@
添加选项
-
-
+
+
-
+
@@ -207,6 +211,9 @@ export default {
}
return info;
});
+ const disableUpdateBtn = computed(() => {
+ return props.info.permissions?.disable_update || false;
+ });
const optionList = ref([]);
const checkGroups = ref([]);
/** 修改选项 */
@@ -356,6 +363,7 @@ export default {
);
return {
copyInfo,
+ disableUpdateBtn,
optionList,
checkGroups,
editChange,
diff --git a/src/views/planetDesign/Design/questions/choice/ChoiceConfig.vue b/src/views/planetDesign/Design/questions/choice/ChoiceConfig.vue
index 12f21c4b..a5ba2ce3 100644
--- a/src/views/planetDesign/Design/questions/choice/ChoiceConfig.vue
+++ b/src/views/planetDesign/Design/questions/choice/ChoiceConfig.vue
@@ -13,7 +13,10 @@
:checked="copyConfig.config.select_random"
@update:checked="update('select_random', $event)"
/>
-
+
选择题型
-
+
每行列数
@@ -56,25 +62,39 @@
- 选择题型
+
+ 选择题型
+
- 单选题
- 多选题
+ 单选题
+
+ 多选题
+
@@ -113,8 +133,8 @@ import ConfigRequire from "../../components/config/ConfigRequire.vue";
import ConfigBaseItem from "../../components/config/ConfigBaseItem.vue";
import { useStore } from "vuex";
import { newQuesConfig } from "../../mode/index";
-import ConfigOptionCount from '../../components/config/ConfigOptionCount.vue';
-import { quickQuesTypeList } from '../../../../../utils/common.js';
+import ConfigOptionCount from "../../components/config/ConfigOptionCount.vue";
+import { quickQuesTypeList } from "../../../../../utils/common.js";
export default {
name: "ChoiceConfig",
components: { ConfigTitle, ConfigRequire, ConfigBaseItem, ConfigOptionCount },
@@ -130,6 +150,9 @@ export default {
const copyConfig = computed(() => {
return reactive(JSON.parse(JSON.stringify(props.config)));
});
+ const disableUpdateBtn = computed(() => {
+ return props.config.permissions?.disable_update || false;
+ });
const title = computed(() => {
const type = store.state?.common?.activeQuestion?.config.quick_type || 0;
const str =
@@ -177,6 +200,7 @@ export default {
};
return {
copyConfig,
+ disableUpdateBtn,
title,
radioChange,
update,
@@ -196,4 +220,7 @@ export default {
margin-left: 16px;
margin-right: 10px;
}
+.disable-btn {
+ color: #8c8c8c;
+}
diff --git a/src/views/planetDesign/Design/questions/completion/CompletionConfig.vue b/src/views/planetDesign/Design/questions/completion/CompletionConfig.vue
index 19b76b66..cf0da9bd 100644
--- a/src/views/planetDesign/Design/questions/completion/CompletionConfig.vue
+++ b/src/views/planetDesign/Design/questions/completion/CompletionConfig.vue
@@ -7,6 +7,7 @@
@@ -41,7 +54,7 @@
:max="4"
class="custom-input-number"
style="width: 98px"
- :parser="val => Math.floor(val)"
+ :parser="(val) => Math.floor(val)"
@blur="update('decimal_few', decimal_few)"
/>
@@ -81,8 +94,20 @@
:type="text_type"
:text="[1, 2].includes(text_type) ? '数值限制' : '字数限制'"
:hide-suffix="[1, 2].includes(text_type)"
- :minParseType="[2].includes(text_type) ? 'float' : ([1].includes(text_type) ? 'int' : 'uint')"
- :maxParseType="[2].includes(text_type) ? 'float' : ([1].includes(text_type) ? 'int' : 'uint')"
+ :minParseType="
+ [2].includes(text_type)
+ ? 'float'
+ : [1].includes(text_type)
+ ? 'int'
+ : 'uint'
+ "
+ :maxParseType="
+ [2].includes(text_type)
+ ? 'float'
+ : [1].includes(text_type)
+ ? 'int'
+ : 'uint'
+ "
@update:blurMin="update('min', $event)"
@update:blurMax="update('max', $event)"
/>
@@ -94,7 +119,7 @@
:max="4"
class="custom-input-number"
style="width: 98px"
- :parser="val => Math.floor(val)"
+ :parser="(val) => Math.floor(val)"
@blur="update('decimal_few', decimal_few)"
/>
@@ -214,7 +239,9 @@ export default defineComponent({
const is_show = computed(() => {
return store.state?.common?.activeQuestion?.config?.is_show || [];
});
-
+ const disableUpdateBtn = computed(() => {
+ return props.config.permissions?.disable_update || false;
+ });
const decimal_few = ref(0);
const line_type = ref(0);
const line_height = ref(1);
@@ -264,6 +291,7 @@ export default defineComponent({
update,
inputNumberBlur,
is_show,
+ disableUpdateBtn,
};
},
});
From d3451261def34d0c0903ca7b4d869fe234ccbd76 Mon Sep 17 00:00:00 2001
From: xcool <2350444842@qq.com>
Date: Wed, 19 Oct 2022 23:07:52 +0800
Subject: [PATCH 3/7] =?UTF-8?q?fix:=E6=96=B0=E5=A2=9E=E9=83=A8=E5=88=86?=
=?UTF-8?q?=E5=BC=B9=E7=AA=97=E7=AD=89=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/font/demo_index.html | 167 +++++++++++++++++-
src/font/iconfont.css | 34 +++-
src/font/iconfont.js | 2 +-
src/font/iconfont.json | 49 +++++
src/font/iconfont.ttf | Bin 90288 -> 91552 bytes
src/font/iconfont.woff | Bin 52148 -> 52936 bytes
src/font/iconfont.woff2 | Bin 43756 -> 44268 bytes
.../DataAnalyse/components/DataTable.vue | 71 +++++++-
.../components/diagram/newBtnList.vue | 8 +
.../use-generator-table-columns.js | 42 ++++-
.../composables/useCustomHeaderTitle.js | 1 +
src/views/DataAnalyse/index.vue | 2 +-
src/views/DataAnalyse/particulars/list.vue | 82 ++++++++-
13 files changed, 436 insertions(+), 22 deletions(-)
diff --git a/src/font/demo_index.html b/src/font/demo_index.html
index 3f03cbe6..515f3ee4 100644
--- a/src/font/demo_index.html
+++ b/src/font/demo_index.html
@@ -54,6 +54,48 @@
+ -
+
+
关键词注释
+ 
+
+
+ -
+
+
收起
+ 
+
+
+ -
+
+
容器 3
+ 
+
+
+ -
+
+
购物车
+ 
+
+
+ -
+
+
个人中心
+ 
+
+
+ -
+
+
账户
+ 
+
+
+ -
+
+
电话
+ 
+
+
-
完成回收总量
@@ -2550,9 +2592,9 @@
@font-face {
font-family: 'iconfont';
- src: url('iconfont.woff2?t=1665669694860') format('woff2'),
- url('iconfont.woff?t=1665669694860') format('woff'),
- url('iconfont.ttf?t=1665669694860') format('truetype');
+ src: url('iconfont.woff2?t=1666180463175') format('woff2'),
+ url('iconfont.woff?t=1666180463175') format('woff'),
+ url('iconfont.ttf?t=1666180463175') format('truetype');
}
第二步：定义使用 iconfont 的样式
@@ -2578,6 +2620,69 @@
+ -
+
+
+ 关键词注释
+
+ .icon-guanjiancizhushi
+
+
+
+ -
+
+
+ 收起
+
+ .icon-shouqi2
+
+
+
+ -
+
+
+ 容器 3
+
+ .icon-a-rongqi31
+
+
+
+ -
+
+
+ 购物车
+
+ .icon-gouwuche
+
+
+
+ -
+
+
+ 个人中心
+
+ .icon-gerenzhongxin1
+
+
+
+ -
+
+
+ 账户
+
+ .icon-zhanghu1
+
+
+
+ -
+
+
+ 电话
+
+ .icon-dianhua1
+
+
+
-
@@ -6322,6 +6427,62 @@
+ -
+
+
关键词注释
+ #icon-guanjiancizhushi
+
+
+ -
+
+
收起
+ #icon-shouqi2
+
+
+ -
+
+
容器 3
+ #icon-a-rongqi31
+
+
+ -
+
+
购物车
+ #icon-gouwuche
+
+
+ -
+
+
个人中心
+ #icon-gerenzhongxin1
+
+
+ -
+
+
账户
+ #icon-zhanghu1
+
+
+ -
+
+
电话
+ #icon-dianhua1
+
+
-