testbookLayout.git

parent: 1b89c6d9 | 补丁 | 提交 | ignore whitespace

闫增涛

2024-05-27 aca2422280bce42ea4fb287c521ba7339536217e

优化

6个文件已修改

1个文件已添加

	package-lock.json	11 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/books/childHealth/view/content/components/chapter001.vue	7 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/books/childHealth/view/content/components/header.vue	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/books/embedded/assets/images/icon/share.svg	7 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/books/embedded/assets/main.less	5 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/books/embedded/view/components/chapter001.vue	45 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	yarn.lock	8975 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 package-lock.json

@@ -10,6 +10,7 @@
      "dependencies": {
        "axios": "^1.6.8",
        "core-js": "^3.8.3",
        "drawflow": "^0.0.59",
        "element-ui": "^2.15.14",
        "lodash": "^4.17.21",
        "moment": "^2.30.1",
@@ -5639,6 +5640,11 @@
      "integrity": "sha512-YXQl1DSa4/PQyRfgrv6aoNjhasp/p4qs9FjJ4q4cQk+8m4r6k4ZSiEyytKG8f8W9gi8WsQtIObNmKd+tMzNTmA==",
      "dev": true,
      "license": "BSD-2-Clause"
    },
    "node_modules/drawflow": {
      "version": "0.0.59",
      "resolved": "https://registry.npmjs.org/drawflow/-/drawflow-0.0.59.tgz",
      "integrity": "sha512-HJM/8trYzignViTMzUSpskRclDhE62jM6oxjgqEJQBbkX9QvDG7JJwRlvdjqnjfL192Pdb0aIysrZMUqG8/vyg=="
    },
    "node_modules/duplexer": {
      "version": "0.1.2",
@@ -16977,6 +16983,11 @@
      "integrity": "sha512-YXQl1DSa4/PQyRfgrv6aoNjhasp/p4qs9FjJ4q4cQk+8m4r6k4ZSiEyytKG8f8W9gi8WsQtIObNmKd+tMzNTmA==",
      "dev": true
    },
    "drawflow": {
      "version": "0.0.59",
      "resolved": "https://registry.npmjs.org/drawflow/-/drawflow-0.0.59.tgz",
      "integrity": "sha512-HJM/8trYzignViTMzUSpskRclDhE62jM6oxjgqEJQBbkX9QvDG7JJwRlvdjqnjfL192Pdb0aIysrZMUqG8/vyg=="
    },
    "duplexer": {
      "version": "0.1.2",
      "resolved": "https://registry.npmmirror.com/duplexer/-/duplexer-0.1.2.tgz",

 src/books/childHealth/view/content/components/chapter001.vue

@@ -4314,7 +4314,12 @@
export default {
  name: "chapter-one",
  components: { examinations },
  props: {},
  props: {
    showPageList:{
      type:Array,
      default:[]
    }
  },
  data() {
    return {
      // 学习一

 src/books/childHealth/view/content/components/header.vue

@@ -197,6 +197,10 @@
export default {
  name: "page-header",
  components: { evenHeaderVue },
  showPageList:{
      type:Array,
      default:[]
    }
};
</script>


 src/books/embedded/assets/images/icon/share.svg

New file
@@ -0,0 +1,7 @@
<svg t="1716802335492" class="icon" viewBox="0 0 1024 1024" version="1.1"
  xmlns="http://www.w3.org/2000/svg" p-id="1782" xmlns:xlink="http://www.w3.org/1999/xlink"
  width="15" height="15">
  <path
    d="M354.986667 219.428571v73.142858H195.047619v536.380952h585.142857V548.571429h73.142857V828.952381a73.142857 73.142857 0 0 1-73.142857 73.142857H195.047619a73.142857 73.142857 0 0 1-73.142857-73.142857V292.571429a73.142857 73.142857 0 0 1 73.142857-73.142858h159.939048z m383.829333-100.473904l172.397714 172.373333-181.00419 181.028571-51.736381-51.712L757.784381 341.333333H670.47619c-139.068952 0-252.245333 110.884571-255.902476 249.07581L414.47619 597.333333v97.52381h-73.142857v-97.52381C341.333333 415.548952 488.69181 268.190476 670.47619 268.190476h114.127239l-97.499429-97.523809 51.712-51.712z"
    p-id="1783"></path>
</svg>

 src/books/embedded/assets/main.less

@@ -827,6 +827,11 @@
      fill: #501438;
    }
  }
  .share-box {
    margin-left: 5px;
    cursor: pointer;
    fill: #501438;
  }
}
body {
  background-color: #e6e6e6;

 src/books/embedded/view/components/chapter001.vue

@@ -451,8 +451,25 @@
          <p class="imgdescript">图1-14　TPC7062K与三菱FX系列PLC通信接线</p>
        </div>
        <p class="content">评分表见表1-1。</p>
        <p class="table-title">
          表1-1　评分表 <i class="el-icon-share cu-pr"></i>
        <p class="table-title fl ju-cn al-cn">
          <span>表1-1　评分表</span>
          <!-- <i class="el-icon-share cu-pr"></i> -->
          <svg
            t="1716802335492"
            class="share-box icon"
            viewBox="0 0 1024 1024"
            version="1.1"
            xmlns="http://www.w3.org/2000/svg"
            p-id="1782"
            xmlns:xlink="http://www.w3.org/1999/xlink"
            width="18"
            height="18"
          >
            <path
              d="M354.986667 219.428571v73.142858H195.047619v536.380952h585.142857V548.571429h73.142857V828.952381a73.142857 73.142857 0 0 1-73.142857 73.142857H195.047619a73.142857 73.142857 0 0 1-73.142857-73.142857V292.571429a73.142857 73.142857 0 0 1 73.142857-73.142858h159.939048z m383.829333-100.473904l172.397714 172.373333-181.00419 181.028571-51.736381-51.712L757.784381 341.333333H670.47619c-139.068952 0-252.245333 110.884571-255.902476 249.07581L414.47619 597.333333v97.52381h-73.142857v-97.52381C341.333333 415.548952 488.69181 268.190476 670.47619 268.190476h114.127239l-97.499429-97.523809 51.712-51.712z"
              p-id="1783"
            ></path>
          </svg>
        </p>
        <table border="1" cellpadding="4" cellspacing="0">
          <tr class="table-bc">
@@ -700,7 +717,23 @@
        <p class="content">评分表见表1-2。</p>
        <div class="qrbodyPic">
          <p class="table-title">
            表1-2　评分表 <i class="el-icon-share cu-pr"></i>
            表1-2　评分表 
            <svg
            t="1716802335492"
            class="share-box icon"
            viewBox="0 0 1024 1024"
            version="1.1"
            xmlns="http://www.w3.org/2000/svg"
            p-id="1782"
            xmlns:xlink="http://www.w3.org/1999/xlink"
            width="18"
            height="18"
          >
            <path
              d="M354.986667 219.428571v73.142858H195.047619v536.380952h585.142857V548.571429h73.142857V828.952381a73.142857 73.142857 0 0 1-73.142857 73.142857H195.047619a73.142857 73.142857 0 0 1-73.142857-73.142857V292.571429a73.142857 73.142857 0 0 1 73.142857-73.142858h159.939048z m383.829333-100.473904l172.397714 172.373333-181.00419 181.028571-51.736381-51.712L757.784381 341.333333H670.47619c-139.068952 0-252.245333 110.884571-255.902476 249.07581L414.47619 597.333333v97.52381h-73.142857v-97.52381C341.333333 415.548952 488.69181 268.190476 670.47619 268.190476h114.127239l-97.499429-97.523809 51.712-51.712z"
              p-id="1783"
            ></path>
          </svg>
          </p>
        </div>
        <table border="1" cellpadding="4" cellspacing="0">
@@ -860,7 +893,7 @@
                  src="../../assets/images/icon/download.png"
                  class="downlod-icon cu-pr"
                /> -->
                <span class="svg-btn"  @click="downloadWord('驱动教程资源')">
                <span class="svg-btn" @click="downloadWord('驱动教程资源')">
                  <svg
                    t="1716796212460"
                    class="icon"
@@ -897,7 +930,7 @@
                  src="../../assets/images/icon/download.png"
                  class="downlod-icon cu-pr"
                /> -->
                <span class="svg-btn"  @click="downloadWord('硬件教程资源')">
                <span class="svg-btn" @click="downloadWord('硬件教程资源')">
                  <svg
                    t="1716796212460"
                    class="icon"
@@ -1611,7 +1644,7 @@
    },
    downloadRar(type) {
      const path = "/配套学习资源/p7/" + type + ".rar";
      window.open(this.config.activeBook.resourceUrl+ path);
      window.open(this.config.activeBook.resourceUrl + path);
    },
    downloadWord(type) {
      const path = "/配套学习资源/p9/教程资源/" + type + ".doc";

 yarn.lock

Diff too large

			@@ -10,6 +10,7 @@
			"dependencies": {
			"axios": "^1.6.8",
			"core-js": "^3.8.3",
			"drawflow": "^0.0.59",
			"element-ui": "^2.15.14",
			"lodash": "^4.17.21",
			"moment": "^2.30.1",
			@@ -5639,6 +5640,11 @@
			"integrity": "sha512-YXQl1DSa4/PQyRfgrv6aoNjhasp/p4qs9FjJ4q4cQk+8m4r6k4ZSiEyytKG8f8W9gi8WsQtIObNmKd+tMzNTmA==",
			"dev": true,
			"license": "BSD-2-Clause"
			},
			"node_modules/drawflow": {
			"version": "0.0.59",
			"resolved": "https://registry.npmjs.org/drawflow/-/drawflow-0.0.59.tgz",
			"integrity": "sha512-HJM/8trYzignViTMzUSpskRclDhE62jM6oxjgqEJQBbkX9QvDG7JJwRlvdjqnjfL192Pdb0aIysrZMUqG8/vyg=="
			},
			"node_modules/duplexer": {
			"version": "0.1.2",
			@@ -16977,6 +16983,11 @@
			"integrity": "sha512-YXQl1DSa4/PQyRfgrv6aoNjhasp/p4qs9FjJ4q4cQk+8m4r6k4ZSiEyytKG8f8W9gi8WsQtIObNmKd+tMzNTmA==",
			"dev": true
			},
			"drawflow": {
			"version": "0.0.59",
			"resolved": "https://registry.npmjs.org/drawflow/-/drawflow-0.0.59.tgz",
			"integrity": "sha512-HJM/8trYzignViTMzUSpskRclDhE62jM6oxjgqEJQBbkX9QvDG7JJwRlvdjqnjfL192Pdb0aIysrZMUqG8/vyg=="
			},
			"duplexer": {
			"version": "0.1.2",
			"resolved": "https://registry.npmmirror.com/duplexer/-/duplexer-0.1.2.tgz",

			@@ -4314,7 +4314,12 @@
			export default {
			name: "chapter-one",
			components: { examinations },
			props: {},
			props: {
			showPageList:{
			type:Array,
			default:[]
			}
			},
			data() {
			return {
			// 学习一

			@@ -197,6 +197,10 @@
			export default {
			name: "page-header",
			components: { evenHeaderVue },
			showPageList:{
			type:Array,
			default:[]
			}
			};
			</script>

New file
			@@ -0,0 +1,7 @@
			<svg t="1716802335492" class="icon" viewBox="0 0 1024 1024" version="1.1"
			xmlns="http://www.w3.org/2000/svg" p-id="1782" xmlns:xlink="http://www.w3.org/1999/xlink"
			width="15" height="15">
			<path
			d="M354.986667 219.428571v73.142858H195.047619v536.380952h585.142857V548.571429h73.142857V828.952381a73.142857 73.142857 0 0 1-73.142857 73.142857H195.047619a73.142857 73.142857 0 0 1-73.142857-73.142857V292.571429a73.142857 73.142857 0 0 1 73.142857-73.142858h159.939048z m383.829333-100.473904l172.397714 172.373333-181.00419 181.028571-51.736381-51.712L757.784381 341.333333H670.47619c-139.068952 0-252.245333 110.884571-255.902476 249.07581L414.47619 597.333333v97.52381h-73.142857v-97.52381C341.333333 415.548952 488.69181 268.190476 670.47619 268.190476h114.127239l-97.499429-97.523809 51.712-51.712z"
			p-id="1783"></path>
			</svg>

			@@ -827,6 +827,11 @@
			fill: #501438;
			}
			}
			.share-box {
			margin-left: 5px;
			cursor: pointer;
			fill: #501438;
			}
			}
			body {
			background-color: #e6e6e6;

			@@ -451,8 +451,25 @@
			<p class="imgdescript">图1-14　TPC7062K与三菱FX系列PLC通信接线</p>
			</div>
			<p class="content">评分表见表1-1。</p>
			<p class="table-title">
			表1-1　评分表 <i class="el-icon-share cu-pr"></i>
			<p class="table-title fl ju-cn al-cn">
			<span>表1-1　评分表</span>
			<!-- <i class="el-icon-share cu-pr"></i> -->
			<svg
			t="1716802335492"
			class="share-box icon"
			viewBox="0 0 1024 1024"
			version="1.1"
			xmlns="http://www.w3.org/2000/svg"
			p-id="1782"
			xmlns:xlink="http://www.w3.org/1999/xlink"
			width="18"
			height="18"
			>
			<path
			d="M354.986667 219.428571v73.142858H195.047619v536.380952h585.142857V548.571429h73.142857V828.952381a73.142857 73.142857 0 0 1-73.142857 73.142857H195.047619a73.142857 73.142857 0 0 1-73.142857-73.142857V292.571429a73.142857 73.142857 0 0 1 73.142857-73.142858h159.939048z m383.829333-100.473904l172.397714 172.373333-181.00419 181.028571-51.736381-51.712L757.784381 341.333333H670.47619c-139.068952 0-252.245333 110.884571-255.902476 249.07581L414.47619 597.333333v97.52381h-73.142857v-97.52381C341.333333 415.548952 488.69181 268.190476 670.47619 268.190476h114.127239l-97.499429-97.523809 51.712-51.712z"
			p-id="1783"
			></path>
			</svg>
			</p>
			<table border="1" cellpadding="4" cellspacing="0">
			<tr class="table-bc">
			@@ -700,7 +717,23 @@
			<p class="content">评分表见表1-2。</p>
			<div class="qrbodyPic">
			<p class="table-title">
			表1-2　评分表 <i class="el-icon-share cu-pr"></i>
			表1-2　评分表
			<svg
			t="1716802335492"
			class="share-box icon"
			viewBox="0 0 1024 1024"
			version="1.1"
			xmlns="http://www.w3.org/2000/svg"
			p-id="1782"
			xmlns:xlink="http://www.w3.org/1999/xlink"
			width="18"
			height="18"
			>
			<path
			d="M354.986667 219.428571v73.142858H195.047619v536.380952h585.142857V548.571429h73.142857V828.952381a73.142857 73.142857 0 0 1-73.142857 73.142857H195.047619a73.142857 73.142857 0 0 1-73.142857-73.142857V292.571429a73.142857 73.142857 0 0 1 73.142857-73.142858h159.939048z m383.829333-100.473904l172.397714 172.373333-181.00419 181.028571-51.736381-51.712L757.784381 341.333333H670.47619c-139.068952 0-252.245333 110.884571-255.902476 249.07581L414.47619 597.333333v97.52381h-73.142857v-97.52381C341.333333 415.548952 488.69181 268.190476 670.47619 268.190476h114.127239l-97.499429-97.523809 51.712-51.712z"
			p-id="1783"
			></path>
			</svg>
			</p>
			</div>
			<table border="1" cellpadding="4" cellspacing="0">
			@@ -860,7 +893,7 @@
			src="../../assets/images/icon/download.png"
			class="downlod-icon cu-pr"
			/> -->
			<span class="svg-btn" @click="downloadWord('驱动教程资源')">
			<span class="svg-btn" @click="downloadWord('驱动教程资源')">
			<svg
			t="1716796212460"
			class="icon"
			@@ -897,7 +930,7 @@
			src="../../assets/images/icon/download.png"
			class="downlod-icon cu-pr"
			/> -->
			<span class="svg-btn" @click="downloadWord('硬件教程资源')">
			<span class="svg-btn" @click="downloadWord('硬件教程资源')">
			<svg
			t="1716796212460"
			class="icon"
			@@ -1611,7 +1644,7 @@
			},
			downloadRar(type) {
			const path = "/配套学习资源/p7/" + type + ".rar";
			window.open(this.config.activeBook.resourceUrl+ path);
			window.open(this.config.activeBook.resourceUrl + path);
			},
			downloadWord(type) {
			const path = "/配套学习资源/p9/教程资源/" + type + ".doc";