diff --git a/public/ico/noPen.ico b/public/ico/noPen.ico index 8c990095..c3a90091 100644 Binary files a/public/ico/noPen.ico and b/public/ico/noPen.ico differ diff --git a/src/views/DataAnalyse/components/diagram/newModal.vue b/src/views/DataAnalyse/components/diagram/newModal.vue index 779d219a..e2e0492a 100644 --- a/src/views/DataAnalyse/components/diagram/newModal.vue +++ b/src/views/DataAnalyse/components/diagram/newModal.vue @@ -71,7 +71,7 @@ - 文本 + 文本 序号 @@ -894,6 +894,10 @@ const changeType = (e) => { message.warning('CSV文件由于格式限制不支持导出代码与文本对照表,如有需要请下载Excel文件!') } } + if (e.target.value ==3) + { + formState.header_column_type = '1' + } // if (e == 3) { // formState.column_type = null // formState.header_column_type = null diff --git a/src/views/planetDesign/redpacket/addset.vue b/src/views/planetDesign/redpacket/addset.vue index 10c81f5e..d0f0cd33 100644 --- a/src/views/planetDesign/redpacket/addset.vue +++ b/src/views/planetDesign/redpacket/addset.vue @@ -1007,11 +1007,13 @@ export default defineComponent({ }); }; const changeallnumber = () => { + if (actDetailform.value.rate > 100) { message.error("概率总和不能大于100"); actDetailform.value.rate='' } }; + //获取活动详情 const actDetail = async () => { spinning.value = true;