Skip to content

R
risk-monitor
提交 02c05e07 authored 作者: 张伊明's avatar 张伊明
浏览文件
操作

fix 解决提出的bug

上级 199fd9dd
流水线 #354 已通过 于阶段
    in 1 分 29 秒
    显示空白字符变更
    内嵌 并排
    正在显示 包含 41 行增加 和 90 行删除
    package-lock.json
    浏览文件 @ 02c05e07
    ......@@ -199,7 +199,6 @@
    "resolved": "https://registry.npmmirror.com/@antv/g6/-/g6-4.8.25.tgz",
    "integrity": "sha512-8mdTnN9QMVNQZtlXmftL8fvRsa4L+GajK58Zp51wyrGLFyjeop8R0QSkCALW45DWP2TaQeZAPtjhQUU/wf5hIg==",
    "license": "MIT",
    "peer": true,
    "dependencies": {
    "@antv/g6-pc": "0.8.25"
    }
    ......@@ -2172,7 +2171,6 @@
    "resolved": "https://registry.npmmirror.com/@types/lodash-es/-/lodash-es-4.17.12.tgz",
    "integrity": "sha512-0NgftHUcV4v34VhXm8QBSftKVXtbkBG3ViCjs6+eJ5a6y6Mi/jiFGPc1sC7QK+9BFhWrURE3EOggmWaSxL9OzQ==",
    "license": "MIT",
    "peer": true,
    "dependencies": {
    "@types/lodash": "*"
    }
    ......@@ -2289,7 +2287,6 @@
    "resolved": "https://registry.npmmirror.com/@vue/compiler-sfc/-/compiler-sfc-3.5.21.tgz",
    "integrity": "sha512-SXlyk6I5eUGBd2v8Ie7tF6ADHE9kCR6mBEuPyH1nUZ0h6Xx6nZI29i12sJKQmzbDyr2tUHMhhTt51Z6blbkTTQ==",
    "license": "MIT",
    "peer": true,
    "dependencies": {
    "@babel/parser": "^7.28.3",
    "@vue/compiler-core": "3.5.21",
    ......@@ -2896,7 +2893,6 @@
    }
    ],
    "license": "MIT",
    "peer": true,
    "dependencies": {
    "baseline-browser-mapping": "^2.9.0",
    "caniuse-lite": "^1.0.30001759",
    ......@@ -3255,7 +3251,6 @@
    "resolved": "https://registry.npmmirror.com/cytoscape/-/cytoscape-3.33.1.tgz",
    "integrity": "sha512-iJc4TwyANnOGR1OmWhsS9ayRS3s+XQ185FmuHObThD+5AeJCakAAbWv8KimMTt08xCCLNgneQwFp+JRJOr9qGQ==",
    "license": "MIT",
    "peer": true,
    "engines": {
    "node": ">=0.10"
    }
    ......@@ -3653,7 +3648,6 @@
    "resolved": "https://registry.npmmirror.com/d3-selection/-/d3-selection-3.0.0.tgz",
    "integrity": "sha512-fmTRWbNMmsmWq6xJV8D19U/gw/bwrHfNXxrIN+HfZgnzqTHp9jOmKMhsTUjXOJnZOdZY9Q28y4yebKzqDKlxlQ==",
    "license": "ISC",
    "peer": true,
    "engines": {
    "node": ">=12"
    }
    ......@@ -3742,7 +3736,6 @@
    "version": "0.8.5",
    "resolved": "https://registry.npmmirror.com/dagre/-/dagre-0.8.5.tgz",
    "integrity": "sha512-/aTqmnRta7x7MCCpExk7HQL2O4owCT2h8NT//9I1OQ9vt29Pa0BzSAkR5lwFUcQ7491yVi/3CXU9jQ5o0Mn2Sw==",
    "peer": true,
    "dependencies": {
    "graphlib": "^2.1.8",
    "lodash": "^4.17.15"
    ......@@ -3950,7 +3943,6 @@
    "resolved": "https://registry.npmmirror.com/echarts/-/echarts-5.6.0.tgz",
    "integrity": "sha512-oTbVTsXfKuEhxftHqL5xprgLoc0k7uScAwtryCgWF6hPYFLRwOUHiFmHGCBKP5NPFNkDVopOieyUqYGH8Fa3kA==",
    "license": "Apache-2.0",
    "peer": true,
    "dependencies": {
    "tslib": "2.3.0",
    "zrender": "5.6.1"
    ......@@ -5342,15 +5334,13 @@
    "version": "4.18.1",
    "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.18.1.tgz",
    "integrity": "sha512-dMInicTPVE8d1e5otfwmmjlxkZoUpiVLwyeTdUsi/Caj/gfzzblBcCE5sRHV/AsjuCmxWrte2TNGSYuCeCq+0Q==",
    "license": "MIT",
    "peer": true
    "license": "MIT"
    },
    "node_modules/lodash-es": {
    "version": "4.18.1",
    "resolved": "https://registry.npmjs.org/lodash-es/-/lodash-es-4.18.1.tgz",
    "integrity": "sha512-J8xewKD/Gk22OZbhpOVSwcs60zhd95ESDwezOFuA3/099925PdHJ7OFHNTGtajL3AlZkykD32HykiMo+BIBI8A==",
    "license": "MIT",
    "peer": true
    "license": "MIT"
    },
    "node_modules/lodash-unified": {
    "version": "1.0.3",
    ......@@ -5398,7 +5388,6 @@
    "resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-14.1.1.tgz",
    "integrity": "sha512-BuU2qnTti9YKgK5N+IeMubp14ZUKUUw7yeJbkjtosvHiP0AZ5c8IAgEMk79D0eC8F23r4Ac/q8cAIFdm2FtyoA==",
    "license": "MIT",
    "peer": true,
    "dependencies": {
    "argparse": "^2.0.1",
    "entities": "^4.4.0",
    ......@@ -6478,7 +6467,6 @@
    "integrity": "sha512-QP88BAKvMam/3NxH6vj2o21R6MjxZUAd6nlwAS/pnGvN9IVLocLHxGYIzFhg6fUQ+5th6P4dv4eW9jX3DSIj7A==",
    "dev": true,
    "license": "MIT",
    "peer": true,
    "engines": {
    "node": ">=12"
    },
    ......@@ -6575,7 +6563,6 @@
    }
    ],
    "license": "MIT",
    "peer": true,
    "dependencies": {
    "nanoid": "^3.3.11",
    "picocolors": "^1.1.1",
    ......@@ -6977,7 +6964,6 @@
    "integrity": "sha512-VmtB2rFU/GroZ4oL8+ZqXgSA38O6GR8KSIvWmEFv63pQ0G6KaBH9s07PO8XTXP4vI+3UJUEypOfjkGfmSBBR0w==",
    "dev": true,
    "license": "MIT",
    "peer": true,
    "dependencies": {
    "@types/estree": "1.0.8"
    },
    ......@@ -8148,7 +8134,6 @@
    "integrity": "sha512-o5a9xKjbtuhY6Bi5S3+HvbRERmouabWbyUcpXXUA1u+GNUKoROi9byOJ8M0nHbHYHkYICiMlqxkg1KkYmm25Sw==",
    "dev": true,
    "license": "MIT",
    "peer": true,
    "dependencies": {
    "esbuild": "^0.21.3",
    "postcss": "^8.4.43",
    ......@@ -8208,7 +8193,6 @@
    "resolved": "https://registry.npmmirror.com/vue/-/vue-3.5.21.tgz",
    "integrity": "sha512-xxf9rum9KtOdwdRkiApWL+9hZEMWE90FHh8yS1+KJAiWYh+iGWV1FquPjoO9VUHQ+VIhsCXNNyZ5Sf4++RVZBA==",
    "license": "MIT",
    "peer": true,
    "dependencies": {
    "@vue/compiler-dom": "3.5.21",
    "@vue/compiler-sfc": "3.5.21",
    ......
    src/views/bill/billHome/index.vue
    浏览文件 @ 02c05e07
    ......@@ -125,7 +125,7 @@
    <DivideHeader id="position2" class="divide2" :titleText="'资讯要闻'"></DivideHeader>
    <div class="center-center">
    <NewsList :newsList="newsList" img="newsImage" title="newsTitle" from="from" content="newsContent"
    @item-click="handleClickNewsDetail" />
    @item-click="handleClickNewsDetail" @more-click="handleToMoreNews" />
    <MessageBubble :messageList="messageList" imageUrl="personImage" @more-click="handleToSocialDetail"
    @person-click="handleClickToCharacter" name="personName" content="remarks" source="orgName" />
    </div>
    ......@@ -297,22 +297,26 @@ import { ElMessage } from "element-plus";
    import { Calendar } from "@element-plus/icons-vue";
    import { useGotoNewsDetail } from "@/router/modules/news";
    // 跳转人物主页
    const handleClickToCharacter = async (id, name) => {
    // 跳转人物主页（MessageBubble 的 person-click 传入整条列表项，需取 personId）
    const handleClickToCharacter = async item => {
    if (!item?.personId) {
    ElMessage.warning("缺少人员信息，无法跳转");
    return;
    }
    const personTypeList = JSON.parse(window.sessionStorage.getItem("personTypeList"));
    let type = 0;
    let personTypeName = "";
    const params = {
    personId: id
    personId: item.personId
    };
    try {
    const res = await getPersonSummaryInfo(params);
    console.log("人物全局信息2", res);
    if (res.code === 200 && res.data) {
    const arr = personTypeList.filter(item => {
    return item.typeId === res.data.personType;
    const arr = personTypeList.filter(pt => {
    return pt.typeId === res.data.personType;
    });
    console.log("arr", arr);
    ......@@ -331,12 +335,12 @@ const handleClickToCharacter = async (id, name) => {
    ElMessage.warning("找不到当前人员的类型值！");
    return;
    }
    window.sessionStorage.setItem("curTabName", name);
    window.sessionStorage.setItem("curTabName", item.personName);
    const route = router.resolve({
    path: "/characterPage",
    query: {
    type: type, // type=1为科技企业领袖，2为国会议员，3为智库研究人员
    personId: id
    personId: item.personId
    }
    });
    window.open(route.href, "_blank");
    ......@@ -458,6 +462,12 @@ const handleToMoreRiskSignal = () => {
    window.open(route.href, "_blank");
    // router.push("/viewRiskSignal")
    };
    // 查看更多新闻资讯（新闻主页）
    const handleToMoreNews = () => {
    const route = router.resolve("/newsBrief");
    window.open(route.href, "_blank");
    };
    // 风险信号
    const warningList = ref([]);
    ......
    src/views/bill/components/layout/BillPageShell.vue
    浏览文件 @ 02c05e07
    ......@@ -36,7 +36,7 @@ export default {
    </script>
    <style scoped lang="scss">
    @import '@/styles/bill-tokens.scss';
    @use '@/styles/bill-tokens.scss' as *;
    .bill-page-shell {
    width: 100%;
    ......
    src/views/bill/components/layout/BillPanel.vue
    浏览文件 @ 02c05e07
    ......@@ -87,7 +87,7 @@ export default {
    </script>
    <style scoped lang="scss">
    @import '@/styles/bill-tokens.scss';
    @use '@/styles/bill-tokens.scss' as *;
    .bill-panel {
    width: 100%;
    ......
    src/views/bill/components/layout/BillTwoColumn.vue
    浏览文件 @ 02c05e07
    ......@@ -93,7 +93,7 @@ export default {
    </script>
    <style scoped lang="scss">
    @import '@/styles/bill-tokens.scss';
    @use '@/styles/bill-tokens.scss' as *;
    .bill-two-column {
    width: 100%;
    ......
    src/views/bill/introdoction/index.vue
    浏览文件 @ 02c05e07
    ......@@ -78,12 +78,19 @@
    <div class="introduction-wrap-right-main">
    <div class="right-main-box1">
    <div class="name-box">
    <div class="person-box">
    <div class="person-item" :class="{ nameItemActive: box3BtnActive === item.name }"
    @click="handleClcikBox3Btn(item.name, index)" v-for="(item, index) in personList" :key="index">
    {{ item.name }}
    </div>
    </div>
    <el-select
    v-model="box3BtnActive"
    class="person-select"
    placeholder="请选择提出人"
    @change="handleClcikBox3Btn"
    >
    <el-option
    v-for="item in personList"
    :key="item.id || item.name"
    :label="item.name"
    :value="item.name"
    />
    </el-select>
    </div>
    <div class="info-box">
    <div class="info-left">
    ......@@ -302,9 +309,10 @@ const personList = ref([]);
    const curPerson = ref({});
    const box3BtnActive = ref("");
    const handleClcikBox3Btn = (name, index) => {
    const handleClcikBox3Btn = name => {
    box3BtnActive.value = name;
    curPerson.value = personList.value[index];
    const targetPerson = personList.value.find(item => item.name === name);
    curPerson.value = targetPerson || {};
    };
    // 法案提出人
    ......@@ -800,59 +808,8 @@ onMounted(() => {
    margin-left: 22px;
    margin-top: 10px;
    .person-box {
    width: 500px;
    overflow-x: hidden;
    display: flex;
    justify-content: flex-start;
    flex-wrap: wrap;
    padding-bottom: 5px;
    &::-webkit-scrollbar {
    height: 4px;
    }
    &::-webkit-scrollbar-thumb {
    border-radius: 4px;
    background: #e1e1e1;
    }
    &::-webkit-scrollbar-track {
    background: transparent;
    }
    .person-item {
    min-height: 28px;
    height: auto;
    box-sizing: border-box;
    border: 1px solid var(--btn-plain-border-color);
    border-radius: 4px;
    background: var(--btn-plain-bg-color);
    color: var(--btn-plain-text-color);
    font-family: Microsoft YaHei;
    font-size: 14px;
    font-weight: 400;
    display: flex;
    flex-direction: row;
    justify-content: center;
    align-items: center;
    margin-right: 8px;
    padding: 1px 12px;
    cursor: pointer;
    white-space: normal;
    word-break: break-all;
    line-height: 18px;
    flex-shrink: 1;
    max-width: 170px;
    text-align: center;
    margin-bottom: 10px;
    }
    .nameItemActive {
    border: 1px solid var(--btn-active-border-color);
    background: var(--btn-active-bg-color);
    color: var(--btn-active-text-color);
    }
    .person-select {
    width: 100%;
    }
    }
    ......
    Markdown 格式
    0% 或
    您添加了 0 人 到此讨论。请谨慎行事。
    请先完成此评论的编辑！
    请 注册 或者 后发表评论