Prechádzať zdrojové kódy

完成主页进去的获取单位显示,完成了退出按钮的样式,完善月统计计划,更改左边树形结构缩放会挤出内容,新增Api月统计修改修改

sunyanqiang 3 rokov pred
rodič
commit
5f3f7c9065

+ 15 - 11
src/App.vue

@@ -5,16 +5,20 @@
 </template>
 
 <script>
-export default  {
-  name:  'App',
-    metaInfo() {
-        return {
-            title: this.$store.state.settings.dynamicTitle && this.$store.state.settings.title,
-            titleTemplate: title => {
-                return title ? `${title} - ${process.env.VUE_APP_TITLE}` : process.env.VUE_APP_TITLE
-            }
-        }
-    },
-}
+export default {
+  name: "App",
+  metaInfo() {
+    return {
+      title:
+        this.$store.state.settings.dynamicTitle &&
+        this.$store.state.settings.title,
+      titleTemplate: (title) => {
+        return title
+          ? `${title} - ${process.env.VUE_APP_TITLE}`
+          : process.env.VUE_APP_TITLE;
+      },
+    };
+  },
+};
 </script>
 

+ 8 - 1
src/api/thought/thoughtPlan.js

@@ -77,4 +77,11 @@ export function JXxiangYingXiangYing(data) {
     data: data
   })
 }
-
+// 查询月教育计划详细
+export function getXiuGaiButton(id) {
+  return request({
+    url: '/thought/thoughtPlan/isResponse',
+    method: 'post',
+    data: id
+  })
+}

+ 539 - 0
src/inconfont/demo.css

@@ -0,0 +1,539 @@
+/* Logo 字体 */
+@font-face {
+  font-family: "iconfont logo";
+  src: url('https://at.alicdn.com/t/font_985780_km7mi63cihi.eot?t=1545807318834');
+  src: url('https://at.alicdn.com/t/font_985780_km7mi63cihi.eot?t=1545807318834#iefix') format('embedded-opentype'),
+    url('https://at.alicdn.com/t/font_985780_km7mi63cihi.woff?t=1545807318834') format('woff'),
+    url('https://at.alicdn.com/t/font_985780_km7mi63cihi.ttf?t=1545807318834') format('truetype'),
+    url('https://at.alicdn.com/t/font_985780_km7mi63cihi.svg?t=1545807318834#iconfont') format('svg');
+}
+
+.logo {
+  font-family: "iconfont logo";
+  font-size: 160px;
+  font-style: normal;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+}
+
+/* tabs */
+.nav-tabs {
+  position: relative;
+}
+
+.nav-tabs .nav-more {
+  position: absolute;
+  right: 0;
+  bottom: 0;
+  height: 42px;
+  line-height: 42px;
+  color: #666;
+}
+
+#tabs {
+  border-bottom: 1px solid #eee;
+}
+
+#tabs li {
+  cursor: pointer;
+  width: 100px;
+  height: 40px;
+  line-height: 40px;
+  text-align: center;
+  font-size: 16px;
+  border-bottom: 2px solid transparent;
+  position: relative;
+  z-index: 1;
+  margin-bottom: -1px;
+  color: #666;
+}
+
+
+#tabs .active {
+  border-bottom-color: #f00;
+  color: #222;
+}
+
+.tab-container .content {
+  display: none;
+}
+
+/* 页面布局 */
+.main {
+  padding: 30px 100px;
+  width: 960px;
+  margin: 0 auto;
+}
+
+.main .logo {
+  color: #333;
+  text-align: left;
+  margin-bottom: 30px;
+  line-height: 1;
+  height: 110px;
+  margin-top: -50px;
+  overflow: hidden;
+  *zoom: 1;
+}
+
+.main .logo a {
+  font-size: 160px;
+  color: #333;
+}
+
+.helps {
+  margin-top: 40px;
+}
+
+.helps pre {
+  padding: 20px;
+  margin: 10px 0;
+  border: solid 1px #e7e1cd;
+  background-color: #fffdef;
+  overflow: auto;
+}
+
+.icon_lists {
+  width: 100% !important;
+  overflow: hidden;
+  *zoom: 1;
+}
+
+.icon_lists li {
+  width: 100px;
+  margin-bottom: 10px;
+  margin-right: 20px;
+  text-align: center;
+  list-style: none !important;
+  cursor: default;
+}
+
+.icon_lists li .code-name {
+  line-height: 1.2;
+}
+
+.icon_lists .icon {
+  display: block;
+  height: 100px;
+  line-height: 100px;
+  font-size: 42px;
+  margin: 10px auto;
+  color: #333;
+  -webkit-transition: font-size 0.25s linear, width 0.25s linear;
+  -moz-transition: font-size 0.25s linear, width 0.25s linear;
+  transition: font-size 0.25s linear, width 0.25s linear;
+}
+
+.icon_lists .icon:hover {
+  font-size: 100px;
+}
+
+.icon_lists .svg-icon {
+  /* 通过设置 font-size 来改变图标大小 */
+  width: 1em;
+  /* 图标和文字相邻时,垂直对齐 */
+  vertical-align: -0.15em;
+  /* 通过设置 color 来改变 SVG 的颜色/fill */
+  fill: currentColor;
+  /* path 和 stroke 溢出 viewBox 部分在 IE 下会显示
+      normalize.css 中也包含这行 */
+  overflow: hidden;
+}
+
+.icon_lists li .name,
+.icon_lists li .code-name {
+  color: #666;
+}
+
+/* markdown 样式 */
+.markdown {
+  color: #666;
+  font-size: 14px;
+  line-height: 1.8;
+}
+
+.highlight {
+  line-height: 1.5;
+}
+
+.markdown img {
+  vertical-align: middle;
+  max-width: 100%;
+}
+
+.markdown h1 {
+  color: #404040;
+  font-weight: 500;
+  line-height: 40px;
+  margin-bottom: 24px;
+}
+
+.markdown h2,
+.markdown h3,
+.markdown h4,
+.markdown h5,
+.markdown h6 {
+  color: #404040;
+  margin: 1.6em 0 0.6em 0;
+  font-weight: 500;
+  clear: both;
+}
+
+.markdown h1 {
+  font-size: 28px;
+}
+
+.markdown h2 {
+  font-size: 22px;
+}
+
+.markdown h3 {
+  font-size: 16px;
+}
+
+.markdown h4 {
+  font-size: 14px;
+}
+
+.markdown h5 {
+  font-size: 12px;
+}
+
+.markdown h6 {
+  font-size: 12px;
+}
+
+.markdown hr {
+  height: 1px;
+  border: 0;
+  background: #e9e9e9;
+  margin: 16px 0;
+  clear: both;
+}
+
+.markdown p {
+  margin: 1em 0;
+}
+
+.markdown>p,
+.markdown>blockquote,
+.markdown>.highlight,
+.markdown>ol,
+.markdown>ul {
+  width: 80%;
+}
+
+.markdown ul>li {
+  list-style: circle;
+}
+
+.markdown>ul li,
+.markdown blockquote ul>li {
+  margin-left: 20px;
+  padding-left: 4px;
+}
+
+.markdown>ul li p,
+.markdown>ol li p {
+  margin: 0.6em 0;
+}
+
+.markdown ol>li {
+  list-style: decimal;
+}
+
+.markdown>ol li,
+.markdown blockquote ol>li {
+  margin-left: 20px;
+  padding-left: 4px;
+}
+
+.markdown code {
+  margin: 0 3px;
+  padding: 0 5px;
+  background: #eee;
+  border-radius: 3px;
+}
+
+.markdown strong,
+.markdown b {
+  font-weight: 600;
+}
+
+.markdown>table {
+  border-collapse: collapse;
+  border-spacing: 0px;
+  empty-cells: show;
+  border: 1px solid #e9e9e9;
+  width: 95%;
+  margin-bottom: 24px;
+}
+
+.markdown>table th {
+  white-space: nowrap;
+  color: #333;
+  font-weight: 600;
+}
+
+.markdown>table th,
+.markdown>table td {
+  border: 1px solid #e9e9e9;
+  padding: 8px 16px;
+  text-align: left;
+}
+
+.markdown>table th {
+  background: #F7F7F7;
+}
+
+.markdown blockquote {
+  font-size: 90%;
+  color: #999;
+  border-left: 4px solid #e9e9e9;
+  padding-left: 0.8em;
+  margin: 1em 0;
+}
+
+.markdown blockquote p {
+  margin: 0;
+}
+
+.markdown .anchor {
+  opacity: 0;
+  transition: opacity 0.3s ease;
+  margin-left: 8px;
+}
+
+.markdown .waiting {
+  color: #ccc;
+}
+
+.markdown h1:hover .anchor,
+.markdown h2:hover .anchor,
+.markdown h3:hover .anchor,
+.markdown h4:hover .anchor,
+.markdown h5:hover .anchor,
+.markdown h6:hover .anchor {
+  opacity: 1;
+  display: inline-block;
+}
+
+.markdown>br,
+.markdown>p>br {
+  clear: both;
+}
+
+
+.hljs {
+  display: block;
+  background: white;
+  padding: 0.5em;
+  color: #333333;
+  overflow-x: auto;
+}
+
+.hljs-comment,
+.hljs-meta {
+  color: #969896;
+}
+
+.hljs-string,
+.hljs-variable,
+.hljs-template-variable,
+.hljs-strong,
+.hljs-emphasis,
+.hljs-quote {
+  color: #df5000;
+}
+
+.hljs-keyword,
+.hljs-selector-tag,
+.hljs-type {
+  color: #a71d5d;
+}
+
+.hljs-literal,
+.hljs-symbol,
+.hljs-bullet,
+.hljs-attribute {
+  color: #0086b3;
+}
+
+.hljs-section,
+.hljs-name {
+  color: #63a35c;
+}
+
+.hljs-tag {
+  color: #333333;
+}
+
+.hljs-title,
+.hljs-attr,
+.hljs-selector-id,
+.hljs-selector-class,
+.hljs-selector-attr,
+.hljs-selector-pseudo {
+  color: #795da3;
+}
+
+.hljs-addition {
+  color: #55a532;
+  background-color: #eaffea;
+}
+
+.hljs-deletion {
+  color: #bd2c00;
+  background-color: #ffecec;
+}
+
+.hljs-link {
+  text-decoration: underline;
+}
+
+/* 代码高亮 */
+/* PrismJS 1.15.0
+https://prismjs.com/download.html#themes=prism&languages=markup+css+clike+javascript */
+/**
+ * prism.js default theme for JavaScript, CSS and HTML
+ * Based on dabblet (http://dabblet.com)
+ * @author Lea Verou
+ */
+code[class*="language-"],
+pre[class*="language-"] {
+  color: black;
+  background: none;
+  text-shadow: 0 1px white;
+  font-family: Consolas, Monaco, 'Andale Mono', 'Ubuntu Mono', monospace;
+  text-align: left;
+  white-space: pre;
+  word-spacing: normal;
+  word-break: normal;
+  word-wrap: normal;
+  line-height: 1.5;
+
+  -moz-tab-size: 4;
+  -o-tab-size: 4;
+  tab-size: 4;
+
+  -webkit-hyphens: none;
+  -moz-hyphens: none;
+  -ms-hyphens: none;
+  hyphens: none;
+}
+
+pre[class*="language-"]::-moz-selection,
+pre[class*="language-"] ::-moz-selection,
+code[class*="language-"]::-moz-selection,
+code[class*="language-"] ::-moz-selection {
+  text-shadow: none;
+  background: #b3d4fc;
+}
+
+pre[class*="language-"]::selection,
+pre[class*="language-"] ::selection,
+code[class*="language-"]::selection,
+code[class*="language-"] ::selection {
+  text-shadow: none;
+  background: #b3d4fc;
+}
+
+@media print {
+
+  code[class*="language-"],
+  pre[class*="language-"] {
+    text-shadow: none;
+  }
+}
+
+/* Code blocks */
+pre[class*="language-"] {
+  padding: 1em;
+  margin: .5em 0;
+  overflow: auto;
+}
+
+:not(pre)>code[class*="language-"],
+pre[class*="language-"] {
+  background: #f5f2f0;
+}
+
+/* Inline code */
+:not(pre)>code[class*="language-"] {
+  padding: .1em;
+  border-radius: .3em;
+  white-space: normal;
+}
+
+.token.comment,
+.token.prolog,
+.token.doctype,
+.token.cdata {
+  color: slategray;
+}
+
+.token.punctuation {
+  color: #999;
+}
+
+.namespace {
+  opacity: .7;
+}
+
+.token.property,
+.token.tag,
+.token.boolean,
+.token.number,
+.token.constant,
+.token.symbol,
+.token.deleted {
+  color: #905;
+}
+
+.token.selector,
+.token.attr-name,
+.token.string,
+.token.char,
+.token.builtin,
+.token.inserted {
+  color: #690;
+}
+
+.token.operator,
+.token.entity,
+.token.url,
+.language-css .token.string,
+.style .token.string {
+  color: #9a6e3a;
+  background: hsla(0, 0%, 100%, .5);
+}
+
+.token.atrule,
+.token.attr-value,
+.token.keyword {
+  color: #07a;
+}
+
+.token.function,
+.token.class-name {
+  color: #DD4A68;
+}
+
+.token.regex,
+.token.important,
+.token.variable {
+  color: #e90;
+}
+
+.token.important,
+.token.bold {
+  font-weight: bold;
+}
+
+.token.italic {
+  font-style: italic;
+}
+
+.token.entity {
+  cursor: help;
+}

+ 487 - 0
src/inconfont/demo_index.html

@@ -0,0 +1,487 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <meta charset="utf-8"/>
+  <title>iconfont Demo</title>
+  <link rel="shortcut icon" href="//img.alicdn.com/imgextra/i2/O1CN01ZyAlrn1MwaMhqz36G_!!6000000001499-73-tps-64-64.ico" type="image/x-icon"/>
+  <link rel="icon" type="image/svg+xml" href="//img.alicdn.com/imgextra/i4/O1CN01EYTRnJ297D6vehehJ_!!6000000008020-55-tps-64-64.svg"/>
+  <link rel="stylesheet" href="https://g.alicdn.com/thx/cube/1.3.2/cube.min.css">
+  <link rel="stylesheet" href="demo.css">
+  <link rel="stylesheet" href="iconfont.css">
+  <script src="iconfont.js"></script>
+  <!-- jQuery -->
+  <script src="https://a1.alicdn.com/oss/uploads/2018/12/26/7bfddb60-08e8-11e9-9b04-53e73bb6408b.js"></script>
+  <!-- 代码高亮 -->
+  <script src="https://a1.alicdn.com/oss/uploads/2018/12/26/a3f714d0-08e6-11e9-8a15-ebf944d7534c.js"></script>
+  <style>
+    .main .logo {
+      margin-top: 0;
+      height: auto;
+    }
+
+    .main .logo a {
+      display: flex;
+      align-items: center;
+    }
+
+    .main .logo .sub-title {
+      margin-left: 0.5em;
+      font-size: 22px;
+      color: #fff;
+      background: linear-gradient(-45deg, #3967FF, #B500FE);
+      -webkit-background-clip: text;
+      -webkit-text-fill-color: transparent;
+    }
+  </style>
+</head>
+<body>
+  <div class="main">
+    <h1 class="logo"><a href="https://www.iconfont.cn/" title="iconfont 首页" target="_blank">
+      <img width="200" src="https://img.alicdn.com/imgextra/i3/O1CN01Mn65HV1FfSEzR6DKv_!!6000000000514-55-tps-228-59.svg">
+      
+    </a></h1>
+    <div class="nav-tabs">
+      <ul id="tabs" class="dib-box">
+        <li class="dib active"><span>Unicode</span></li>
+        <li class="dib"><span>Font class</span></li>
+        <li class="dib"><span>Symbol</span></li>
+      </ul>
+      
+      <a href="https://www.iconfont.cn/manage/index?manage_type=myprojects&projectId=2786925" target="_blank" class="nav-more">查看项目</a>
+      
+    </div>
+    <div class="tab-container">
+      <div class="content unicode" style="display: block;">
+          <ul class="icon_lists dib-box">
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe64b;</span>
+                <div class="name">退出</div>
+                <div class="code-name">&amp;#xe64b;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe702;</span>
+                <div class="name">线性橘子</div>
+                <div class="code-name">&amp;#xe702;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe703;</span>
+                <div class="name">线性荔枝</div>
+                <div class="code-name">&amp;#xe703;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe704;</span>
+                <div class="name">线性柠檬</div>
+                <div class="code-name">&amp;#xe704;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe705;</span>
+                <div class="name">线性榴莲</div>
+                <div class="code-name">&amp;#xe705;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe706;</span>
+                <div class="name">线性火龙果</div>
+                <div class="code-name">&amp;#xe706;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe707;</span>
+                <div class="name">线性山竹</div>
+                <div class="code-name">&amp;#xe707;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe708;</span>
+                <div class="name">线性石榴</div>
+                <div class="code-name">&amp;#xe708;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe709;</span>
+                <div class="name">线性葡萄</div>
+                <div class="code-name">&amp;#xe709;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe70a;</span>
+                <div class="name">线性西瓜</div>
+                <div class="code-name">&amp;#xe70a;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe60c;</span>
+                <div class="name">手绘小星星</div>
+                <div class="code-name">&amp;#xe60c;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe66b;</span>
+                <div class="name">面性关注图标</div>
+                <div class="code-name">&amp;#xe66b;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe66c;</span>
+                <div class="name">面性挥手图标</div>
+                <div class="code-name">&amp;#xe66c;</div>
+              </li>
+          
+          </ul>
+          <div class="article markdown">
+          <h2 id="unicode-">Unicode 引用</h2>
+          <hr>
+
+          <p>Unicode 是字体在网页端最原始的应用方式,特点是:</p>
+          <ul>
+            <li>支持按字体的方式去动态调整图标大小,颜色等等。</li>
+            <li>默认情况下不支持多色,直接添加多色图标会自动去色。</li>
+          </ul>
+          <blockquote>
+            <p>注意:新版 iconfont 支持两种方式引用多色图标:SVG symbol 引用方式和彩色字体图标模式。(使用彩色字体图标需要在「编辑项目」中开启「彩色」选项后并重新生成。)</p>
+          </blockquote>
+          <p>Unicode 使用步骤如下:</p>
+          <h3 id="-font-face">第一步:拷贝项目下面生成的 <code>@font-face</code></h3>
+<pre><code class="language-css"
+>@font-face {
+  font-family: 'iconfont';
+  src: url('iconfont.woff2?t=1650105618782') format('woff2'),
+       url('iconfont.woff?t=1650105618782') format('woff'),
+       url('iconfont.ttf?t=1650105618782') format('truetype');
+}
+</code></pre>
+          <h3 id="-iconfont-">第二步:定义使用 iconfont 的样式</h3>
+<pre><code class="language-css"
+>.iconfont {
+  font-family: "iconfont" !important;
+  font-size: 16px;
+  font-style: normal;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+}
+</code></pre>
+          <h3 id="-">第三步:挑选相应图标并获取字体编码,应用于页面</h3>
+<pre>
+<code class="language-html"
+>&lt;span class="iconfont"&gt;&amp;#x33;&lt;/span&gt;
+</code></pre>
+          <blockquote>
+            <p>"iconfont" 是你项目下的 font-family。可以通过编辑项目查看,默认是 "iconfont"。</p>
+          </blockquote>
+          </div>
+      </div>
+      <div class="content font-class">
+        <ul class="icon_lists dib-box">
+          
+          <li class="dib">
+            <span class="icon iconfont icon-logout"></span>
+            <div class="name">
+              退出
+            </div>
+            <div class="code-name">.icon-logout
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-xianxingjuzi"></span>
+            <div class="name">
+              线性橘子
+            </div>
+            <div class="code-name">.icon-xianxingjuzi
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-xianxinglizhi"></span>
+            <div class="name">
+              线性荔枝
+            </div>
+            <div class="code-name">.icon-xianxinglizhi
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-xianxingningmeng"></span>
+            <div class="name">
+              线性柠檬
+            </div>
+            <div class="code-name">.icon-xianxingningmeng
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-xianxingliulian"></span>
+            <div class="name">
+              线性榴莲
+            </div>
+            <div class="code-name">.icon-xianxingliulian
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-xianxinghuolongguo"></span>
+            <div class="name">
+              线性火龙果
+            </div>
+            <div class="code-name">.icon-xianxinghuolongguo
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-xianxingshanzhu"></span>
+            <div class="name">
+              线性山竹
+            </div>
+            <div class="code-name">.icon-xianxingshanzhu
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-xianxingshiliu"></span>
+            <div class="name">
+              线性石榴
+            </div>
+            <div class="code-name">.icon-xianxingshiliu
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-xianxingputao"></span>
+            <div class="name">
+              线性葡萄
+            </div>
+            <div class="code-name">.icon-xianxingputao
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-xianxingxigua"></span>
+            <div class="name">
+              线性西瓜
+            </div>
+            <div class="code-name">.icon-xianxingxigua
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-icon-star"></span>
+            <div class="name">
+              手绘小星星
+            </div>
+            <div class="code-name">.icon-icon-star
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-mianxingguanzhutubiao"></span>
+            <div class="name">
+              面性关注图标
+            </div>
+            <div class="code-name">.icon-mianxingguanzhutubiao
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-mianxinghuishoutubiao"></span>
+            <div class="name">
+              面性挥手图标
+            </div>
+            <div class="code-name">.icon-mianxinghuishoutubiao
+            </div>
+          </li>
+          
+        </ul>
+        <div class="article markdown">
+        <h2 id="font-class-">font-class 引用</h2>
+        <hr>
+
+        <p>font-class 是 Unicode 使用方式的一种变种,主要是解决 Unicode 书写不直观,语意不明确的问题。</p>
+        <p>与 Unicode 使用方式相比,具有如下特点:</p>
+        <ul>
+          <li>相比于 Unicode 语意明确,书写更直观。可以很容易分辨这个 icon 是什么。</li>
+          <li>因为使用 class 来定义图标,所以当要替换图标时,只需要修改 class 里面的 Unicode 引用。</li>
+        </ul>
+        <p>使用步骤如下:</p>
+        <h3 id="-fontclass-">第一步:引入项目下面生成的 fontclass 代码:</h3>
+<pre><code class="language-html">&lt;link rel="stylesheet" href="./iconfont.css"&gt;
+</code></pre>
+        <h3 id="-">第二步:挑选相应图标并获取类名,应用于页面:</h3>
+<pre><code class="language-html">&lt;span class="iconfont icon-xxx"&gt;&lt;/span&gt;
+</code></pre>
+        <blockquote>
+          <p>"
+            iconfont" 是你项目下的 font-family。可以通过编辑项目查看,默认是 "iconfont"。</p>
+        </blockquote>
+      </div>
+      </div>
+      <div class="content symbol">
+          <ul class="icon_lists dib-box">
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-logout"></use>
+                </svg>
+                <div class="name">退出</div>
+                <div class="code-name">#icon-logout</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-xianxingjuzi"></use>
+                </svg>
+                <div class="name">线性橘子</div>
+                <div class="code-name">#icon-xianxingjuzi</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-xianxinglizhi"></use>
+                </svg>
+                <div class="name">线性荔枝</div>
+                <div class="code-name">#icon-xianxinglizhi</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-xianxingningmeng"></use>
+                </svg>
+                <div class="name">线性柠檬</div>
+                <div class="code-name">#icon-xianxingningmeng</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-xianxingliulian"></use>
+                </svg>
+                <div class="name">线性榴莲</div>
+                <div class="code-name">#icon-xianxingliulian</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-xianxinghuolongguo"></use>
+                </svg>
+                <div class="name">线性火龙果</div>
+                <div class="code-name">#icon-xianxinghuolongguo</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-xianxingshanzhu"></use>
+                </svg>
+                <div class="name">线性山竹</div>
+                <div class="code-name">#icon-xianxingshanzhu</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-xianxingshiliu"></use>
+                </svg>
+                <div class="name">线性石榴</div>
+                <div class="code-name">#icon-xianxingshiliu</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-xianxingputao"></use>
+                </svg>
+                <div class="name">线性葡萄</div>
+                <div class="code-name">#icon-xianxingputao</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-xianxingxigua"></use>
+                </svg>
+                <div class="name">线性西瓜</div>
+                <div class="code-name">#icon-xianxingxigua</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-icon-star"></use>
+                </svg>
+                <div class="name">手绘小星星</div>
+                <div class="code-name">#icon-icon-star</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-mianxingguanzhutubiao"></use>
+                </svg>
+                <div class="name">面性关注图标</div>
+                <div class="code-name">#icon-mianxingguanzhutubiao</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-mianxinghuishoutubiao"></use>
+                </svg>
+                <div class="name">面性挥手图标</div>
+                <div class="code-name">#icon-mianxinghuishoutubiao</div>
+            </li>
+          
+          </ul>
+          <div class="article markdown">
+          <h2 id="symbol-">Symbol 引用</h2>
+          <hr>
+
+          <p>这是一种全新的使用方式,应该说这才是未来的主流,也是平台目前推荐的用法。相关介绍可以参考这篇<a href="">文章</a>
+            这种用法其实是做了一个 SVG 的集合,与另外两种相比具有如下特点:</p>
+          <ul>
+            <li>支持多色图标了,不再受单色限制。</li>
+            <li>通过一些技巧,支持像字体那样,通过 <code>font-size</code>, <code>color</code> 来调整样式。</li>
+            <li>兼容性较差,支持 IE9+,及现代浏览器。</li>
+            <li>浏览器渲染 SVG 的性能一般,还不如 png。</li>
+          </ul>
+          <p>使用步骤如下:</p>
+          <h3 id="-symbol-">第一步:引入项目下面生成的 symbol 代码:</h3>
+<pre><code class="language-html">&lt;script src="./iconfont.js"&gt;&lt;/script&gt;
+</code></pre>
+          <h3 id="-css-">第二步:加入通用 CSS 代码(引入一次就行):</h3>
+<pre><code class="language-html">&lt;style&gt;
+.icon {
+  width: 1em;
+  height: 1em;
+  vertical-align: -0.15em;
+  fill: currentColor;
+  overflow: hidden;
+}
+&lt;/style&gt;
+</code></pre>
+          <h3 id="-">第三步:挑选相应图标并获取类名,应用于页面:</h3>
+<pre><code class="language-html">&lt;svg class="icon" aria-hidden="true"&gt;
+  &lt;use xlink:href="#icon-xxx"&gt;&lt;/use&gt;
+&lt;/svg&gt;
+</code></pre>
+          </div>
+      </div>
+
+    </div>
+  </div>
+  <script>
+  $(document).ready(function () {
+      $('.tab-container .content:first').show()
+
+      $('#tabs li').click(function (e) {
+        var tabContent = $('.tab-container .content')
+        var index = $(this).index()
+
+        if ($(this).hasClass('active')) {
+          return
+        } else {
+          $('#tabs li').removeClass('active')
+          $(this).addClass('active')
+
+          tabContent.hide().eq(index).fadeIn()
+        }
+      })
+    })
+  </script>
+</body>
+</html>

+ 67 - 0
src/inconfont/iconfont.css

@@ -0,0 +1,67 @@
+@font-face {
+  font-family: "iconfont";
+  /* Project id 2786925 */
+  src: url('iconfont.woff2?t=1650105618782') format('woff2'),
+    url('iconfont.woff?t=1650105618782') format('woff'),
+    url('iconfont.ttf?t=1650105618782') format('truetype');
+}
+
+.iconfont {
+  font-family: "iconfont" !important;
+  font-size: 16px;
+  font-style: normal;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+}
+
+.icon-logout:before {
+  content: "\e64b";
+}
+
+.icon-xianxingjuzi:before {
+  content: "\e702";
+}
+
+.icon-xianxinglizhi:before {
+  content: "\e703";
+}
+
+.icon-xianxingningmeng:before {
+  content: "\e704";
+}
+
+.icon-xianxingliulian:before {
+  content: "\e705";
+}
+
+.icon-xianxinghuolongguo:before {
+  content: "\e706";
+}
+
+.icon-xianxingshanzhu:before {
+  content: "\e707";
+}
+
+.icon-xianxingshiliu:before {
+  content: "\e708";
+}
+
+.icon-xianxingputao:before {
+  content: "\e709";
+}
+
+.icon-xianxingxigua:before {
+  content: "\e70a";
+}
+
+.icon-icon-star:before {
+  content: "\e60c";
+}
+
+.icon-mianxingguanzhutubiao:before {
+  content: "\e66b";
+}
+
+.icon-mianxinghuishoutubiao:before {
+  content: "\e66c";
+}

Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
src/inconfont/iconfont.js


+ 100 - 0
src/inconfont/iconfont.json

@@ -0,0 +1,100 @@
+{
+  "id": "2786925",
+  "name": "iconform",
+  "font_family": "iconfont",
+  "css_prefix_text": "icon-",
+  "description": "",
+  "glyphs": [
+    {
+      "icon_id": "459500",
+      "name": "退出",
+      "font_class": "logout",
+      "unicode": "e64b",
+      "unicode_decimal": 58955
+    },
+    {
+      "icon_id": "24049346",
+      "name": "线性橘子",
+      "font_class": "xianxingjuzi",
+      "unicode": "e702",
+      "unicode_decimal": 59138
+    },
+    {
+      "icon_id": "24049347",
+      "name": "线性荔枝",
+      "font_class": "xianxinglizhi",
+      "unicode": "e703",
+      "unicode_decimal": 59139
+    },
+    {
+      "icon_id": "24049349",
+      "name": "线性柠檬",
+      "font_class": "xianxingningmeng",
+      "unicode": "e704",
+      "unicode_decimal": 59140
+    },
+    {
+      "icon_id": "24049350",
+      "name": "线性榴莲",
+      "font_class": "xianxingliulian",
+      "unicode": "e705",
+      "unicode_decimal": 59141
+    },
+    {
+      "icon_id": "24049355",
+      "name": "线性火龙果",
+      "font_class": "xianxinghuolongguo",
+      "unicode": "e706",
+      "unicode_decimal": 59142
+    },
+    {
+      "icon_id": "24049360",
+      "name": "线性山竹",
+      "font_class": "xianxingshanzhu",
+      "unicode": "e707",
+      "unicode_decimal": 59143
+    },
+    {
+      "icon_id": "24049364",
+      "name": "线性石榴",
+      "font_class": "xianxingshiliu",
+      "unicode": "e708",
+      "unicode_decimal": 59144
+    },
+    {
+      "icon_id": "24049370",
+      "name": "线性葡萄",
+      "font_class": "xianxingputao",
+      "unicode": "e709",
+      "unicode_decimal": 59145
+    },
+    {
+      "icon_id": "24049373",
+      "name": "线性西瓜",
+      "font_class": "xianxingxigua",
+      "unicode": "e70a",
+      "unicode_decimal": 59146
+    },
+    {
+      "icon_id": "5289866",
+      "name": "手绘小星星",
+      "font_class": "icon-star",
+      "unicode": "e60c",
+      "unicode_decimal": 58892
+    },
+    {
+      "icon_id": "23977904",
+      "name": "面性关注图标",
+      "font_class": "mianxingguanzhutubiao",
+      "unicode": "e66b",
+      "unicode_decimal": 58987
+    },
+    {
+      "icon_id": "23977905",
+      "name": "面性挥手图标",
+      "font_class": "mianxinghuishoutubiao",
+      "unicode": "e66c",
+      "unicode_decimal": 58988
+    }
+  ]
+}

BIN
src/inconfont/iconfont.ttf


BIN
src/inconfont/iconfont.woff


BIN
src/inconfont/iconfont.woff2


+ 60 - 18
src/layout/components/Navbar.vue

@@ -18,33 +18,34 @@
       <div class="yong_hu">
         <span style="color: ">单位 :</span>
         <span class="span" style="padding-left: 4px">{{ danWie }}</span>
-        <span>用户名 :</span>
-        <span style="padding-left: 4px">{{ yongHu }}</span>
+        <router-link to="/user/profile">
+          <span style="color: #00f6ff">用户名 :</span>
+          <span style="padding-left: 4px; color: #00f6ff">{{ yongHu }}</span>
+          <!-- <el-dropdown-item>个人中心</el-dropdown-item> -->
+        </router-link>
       </div>
       <template v-if="device !== 'mobile'">
         <screenfull id="screenfull" class="right-menu-item hover-effect" />
       </template>
-
-      <el-dropdown
+      <!-- <el-dropdown
         class="avatar-container right-menu-item hover-effect"
         trigger="click"
-      >
-        <div class="avatar-wrapper">
-          <img :src="avatar" class="user-avatar" />
-          <i class="el-icon-caret-bottom" />
-        </div>
-        <el-dropdown-menu slot="dropdown">
-          <router-link to="/user/profile">
-            <el-dropdown-item>个人中心</el-dropdown-item>
-          </router-link>
-          <el-dropdown-item @click.native="setting = true">
+      > -->
+      <div class="avatar-wrapper">
+        <span class="iconfont icon-logout" @click="logout"></span>
+        <!-- <el-button @click.native="logout" size="btl">退出登录</el-button> -->
+        <!-- <img :src="avatar" class="user-avatar" />
+          <i class="el-icon-caret-bottom" /> -->
+      </div>
+      <!-- <el-dropdown-menu slot="dropdown"> -->
+      <!-- <el-dropdown-item @click.native="setting = true">
             <span>布局设置</span>
           </el-dropdown-item>
           <el-dropdown-item divided @click.native="logout">
             <span>退出登录</span>
-          </el-dropdown-item>
-        </el-dropdown-menu>
-      </el-dropdown>
+          </el-dropdown-item> -->
+      <!-- </el-dropdown-menu> -->
+      <!-- </el-dropdown> -->
     </div>
   </div>
 </template>
@@ -204,7 +205,7 @@ export default {
       margin-right: 30px;
 
       .avatar-wrapper {
-        margin-top: 5px;
+        // margin-top: 5px;
         position: relative;
 
         .user-avatar {
@@ -233,4 +234,45 @@ export default {
 .span {
   margin-right: 26px;
 }
+/* 退出登录 btl */
+.el-button--btl.is-active,
+.el-button--btl:active {
+  background: #ff4949;
+  border-color: #ff4949;
+  color: #ffffff;
+}
+
+.el-button--btl:focus,
+.el-button--btl:hover {
+  background: #ff4949;
+  border-color: #ff4949;
+  color: #ffffff;
+}
+
+.el-button--btl {
+  width: 80px !important;
+  border: 1px solid transparent;
+  padding: 3px 8px;
+  font-size: 14px;
+  line-height: 1.5;
+  border-radius: 3px;
+  color: #fff;
+  background-color: #ff4949;
+  height: 29px;
+}
+
+.avatar-wrapper {
+  display: inline-block;
+  padding: 0 8px;
+  height: 100%;
+  font-size: 18px;
+  color: #5a5e66;
+  vertical-align: text-bottom;
+  margin-right: 20px;
+}
+.iconfont {
+  color: #fff;
+  font-size: 27px;
+  cursor: pointer;
+}
 </style>

+ 4 - 2
src/main.js

@@ -13,12 +13,14 @@ import router from './router'
 import directive from './directive' //directive
 import plugins from './plugins' // plugins
 
+
 // 引入jquery
 import $ from "jquery";
 window.$ = $;
 window.jQuery = $;
 export default $;
-
+// 引入字体图标
+import '@/inconfont/iconfont.css';
 
 import './assets/icons' // icon
 import './permission' // permission control
@@ -124,7 +126,7 @@ Vue.prototype.$on = function (event, func) {
   let newFunc = func
   if (event == 'click') {
     newFunc = function () {
-      if(flag) {
+      if (flag) {
         func.apply(this, arguments)
         flag = false
       }

+ 2 - 2
src/views/grassrootsregistration/bdgldiary/index.vue

@@ -682,7 +682,7 @@
                       v-if="e == checkShop.length - 1"
                     ></el-button>
                     <el-button
-                      type="primary"
+                      type="danger"
                       icon="el-icon-delete"
                       size="mini"
                       v-if="e > 0"
@@ -769,7 +769,7 @@
                       v-if="i == relatives.length - 1"
                     ></el-button>
                     <el-button
-                      type="primary"
+                      type="danger"
                       icon="el-icon-delete"
                       size="mini"
                       v-if="i > 0"

+ 1 - 1
src/views/grassrootsregistration/bdglparty/index.vue

@@ -493,7 +493,7 @@ export default {
       var str = str.replace(/<\/?[^>]*>/g, "");
       str = str.replace(/[ | ]*\n/g, "\n");
       str = str.replace(/ /gi, "");
-      console.log(str);
+      // console.log(str);
       return str;
     },
     // 重置表单人员

+ 1 - 2
src/views/grassrootsregistration/bdglweekwork/index.vue

@@ -408,7 +408,7 @@
                   v-if="i == tomList.length - 1"
                 ></el-button>
                 <el-button
-                  type="primary"
+                  type="danger"
                   icon="el-icon-delete"
                   @click="jtDelete(i)"
                   v-if="i != 0"
@@ -751,7 +751,6 @@ export default {
         this.form.unitName = null;
         this.form.bdglWeekworkRegisterList = null;
         exportBdglgetWeekWork(this.form).then((res) => {
-          console.log(res.code);
           this.code = res.code;
           if (res.code == 200) {
             this.$modal.msgWarning(res.msg);

+ 61 - 20
src/views/pt.vue

@@ -4,7 +4,15 @@
     <div class="box">
       <!-- 头部区域 -->
       <div class="tou">
-        <span style="color: #00ccff; font-size: 1.2vw">{{ times }}</span>
+        <div class="yong_hu">
+          <span style="color: ">单位 :</span>
+          <span class="span" style="padding-left: 4px">{{ danWie }}</span>
+          <span style="color: #00f6ff">用户名 :</span>
+          <span style="padding-left: 4px; color: #00f6ff">{{ yongHu }}</span>
+        </div>
+        <span style="color: #00f6ff; font-size: 1vw" class="tiem">{{
+          times
+        }}</span>
         <!-- <img class="liuxian" src="../assets/images/流线.gif" alt />
         <img class="img-left" src="../assets/images/闪烁GIF-慢.gif" alt /> -->
       </div>
@@ -181,7 +189,11 @@
           <ul class="ul">
             <li>
               <div class="demo-box">
-                <div class="demo active" v-on:click="sixiangfun" data-url="/diary?ref=addtabs">
+                <div
+                  class="demo active"
+                  v-on:click="sixiangfun"
+                  data-url="/diary?ref=addtabs"
+                >
                   <img src="../images/sx.png" alt />
                 </div>
               </div>
@@ -597,6 +609,7 @@ import {
   updateNotice,
   getWorkTask,
 } from "@/api/pt";
+import { getUserProfile } from "@/api/system/user";
 import Cookies from "js-cookie";
 export default {
   dicts: ["sys_notice_status", "sys_notice_type"],
@@ -630,9 +643,14 @@ export default {
       form: {},
       noticeList: [],
       worklist: [],
+      // 用户信息
+      user: {},
+      danWie: "",
+      yongHu: "",
     };
   },
   created() {
+    this.getUser();
     this.timer = null;
     this.startTime();
     this.timer2 = null;
@@ -647,6 +665,14 @@ export default {
     // console.log(this.$route.params.name)
   },
   methods: {
+    // 获取登录信息
+    getUser() {
+      getUserProfile().then((response) => {
+        this.user = response.data;
+        this.danWie = response.data.dept.deptName;
+        this.yongHu = response.data.nickName;
+      });
+    },
     getlist() {
       listNotice().then((res) => {
         this.noticeList = res.data;
@@ -701,95 +727,95 @@ export default {
       this.$router
         .push({ path: "/index", query: { name: "/grassrootsregistration" } })
         .catch(() => {});
-        Cookies.set('shuaxin','false');
+      Cookies.set("shuaxin", "false");
     },
     zhanbeifun() {
       this.$router
         .push({ path: "/index", query: { name: "/combatduty" } })
         .catch(() => {});
-        Cookies.set('shuaxin','false');
+      Cookies.set("shuaxin", "false");
     },
     renlifun() {
       this.$router
         .push({ path: "/index", query: { name: "/peopleManage" } })
         .catch(() => {});
-        Cookies.set('shuaxin','false');
+      Cookies.set("shuaxin", "false");
     },
     renyuanfun() {
       this.$router
         .push({ path: "/index", query: { name: "/peopleChuRu" } })
         .catch(() => {});
-        Cookies.set('shuaxin','false');
+      Cookies.set("shuaxin", "false");
     },
     yingfangfun() {
       this.$router
         .push({ path: "/index", query: { name: "/barracksManagement" } })
         .catch(() => {});
-        Cookies.set('shuaxin','false');
+      Cookies.set("shuaxin", "false");
     },
     junchefun() {
       this.$router
         .push({ path: "/index", query: { name: "/militaryvehicleManagement" } })
         .catch(() => {});
-        Cookies.set('shuaxin','false');
+      Cookies.set("shuaxin", "false");
     },
     gongzuofun() {
       this.$router
         .push({ path: "/index", query: { name: "/workingArrangements" } })
         .catch(() => {});
-        Cookies.set('shuaxin','false');
+      Cookies.set("shuaxin", "false");
     },
     guizhangfun() {
       this.$router
         .push({ path: "/index", query: { name: "/regulations" } })
         .catch(() => {});
-        Cookies.set('shuaxin','false');
+      Cookies.set("shuaxin", "false");
     },
     yiliaofun() {
       this.$router
         .push({ path: "/index", query: { name: "/medicalhealth" } })
         .catch(() => {});
-        Cookies.set('shuaxin','false');
+      Cookies.set("shuaxin", "false");
     },
     jianchafun() {
       this.$router
         .push({ path: "/index", query: { name: "/bdglregular" } })
         .catch(() => {});
-        Cookies.set('shuaxin','false');
+      Cookies.set("shuaxin", "false");
     },
     mengangfun() {
       this.$router
         .push({ path: "/index", query: { name: "/doormanManage" } })
         .catch(() => {});
-        Cookies.set('shuaxin','false');
+      Cookies.set("shuaxin", "false");
     },
     yingjufun() {
       this.$router
         .push({ path: "/index", query: { name: "/materialManagement" } })
         .catch(() => {});
-        Cookies.set('shuaxin','false');
+      Cookies.set("shuaxin", "false");
     },
     xitongfun() {
       this.$router
         .push({ path: "/index", query: { name: "/system" } })
         .catch(() => {});
-        Cookies.set('shuaxin','false');
+      Cookies.set("shuaxin", "false");
     },
     gongju() {
       this.$router
         .push({ path: "/index", query: { name: "/tool" } })
         .catch(() => {});
-        Cookies.set('shuaxin','false');
+      Cookies.set("shuaxin", "false");
     },
     wenyinfun() {
       this.$router
         .push({ path: "/index", query: { name: "/print" } })
         .catch(() => {});
-       Cookies.set('shuaxin','false');
+      Cookies.set("shuaxin", "false");
     },
     taishifun() {
       this.$router.push({ path: "/taishi" }).catch(() => {});
-      Cookies.set('shuaxin','false');
+      Cookies.set("shuaxin", "false");
       // window.open(`/taishi`,'_self');
     },
     baomifun() {
@@ -992,10 +1018,25 @@ li {
   background: url("../assets/images/首页顶部1.gif") no-repeat center;
   background-size: cover;
 }
-.tou span {
+.tou .yong_hu {
   position: absolute;
-  right: 100px;
+  right: 24px;
   top: 33px;
+  min-width: 320px;
+  font-size: 15px;
+  box-sizing: border-box;
+}
+.tou .tiem {
+  position: absolute;
+  /* right: 24px; */
+  left: 124px;
+  top: 33px;
+  min-width: 320px;
+  font-size: 15px;
+  box-sizing: border-box;
+}
+.tou .span {
+  margin-right: 20px;
 }
 .liuxian {
   position: absolute;

+ 273 - 240
src/views/thought/getready/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
-      <div class="box-lfet">
-      <!-- <div class="data">
+    <!-- <div class="box-lfet"> -->
+    <!-- <div class="data">
         <p>单位</p>
         <div class="a1"></div>
         <el-date-picker
@@ -14,7 +14,26 @@
         >
         </el-date-picker>
       </div> -->
-      <div class="dadui">
+    <el-row :gutter="20">
+      <el-col :span="4" :xs="24">
+        <div class="dadui">
+          <img src="../../../images/星星.png" alt />
+          大队
+        </div>
+        <div class="tree">
+          <el-tree
+            class="userAgrees"
+            style="height: 700px; overflow: auto"
+            :data="deptOptions"
+            :props="defaultProps"
+            @node-click="handleNodeClick"
+            default-expand-all
+            highlight-current
+            :expand-on-click-node="false"
+          ></el-tree>
+        </div>
+      </el-col>
+      <!-- <div class="dadui">
         <img src="../../../images/星星.png" alt="" />
         大队
       </div>
@@ -29,10 +48,10 @@
           highlight-current
           :expand-on-click-node="false"
         ></el-tree>
-      </div>
-    </div>
-    <div class="box-right">
-    <!-- <el-form
+      </div> -->
+      <!-- </div> -->
+      <!-- <div class="box-right"> -->
+      <!-- <el-form
       :model="queryParams"
       ref="queryForm"
       :inline="true"
@@ -116,7 +135,7 @@
         />
       </el-form-item>
       <el-form-item prop="recorder" label-width="59px"> -->
-        <!-- <el-input
+      <!-- <el-input
           v-model="queryParams.recorder"
           placeholder="请输入记录人"
           clearable
@@ -124,7 +143,7 @@
           @input="handleQuery"
         />
       </el-form-item> -->
-        <!-- <el-select
+      <!-- <el-select
           v-model="queryParams.recorder"
           ref="peoplenames"
           placeholder="请选择记录人"
@@ -148,14 +167,14 @@
         />
       </el-form-item> -->
       <!-- <el-form-item> -->
-        <!-- <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button> -->
-        <!-- <el-button icon="el-icon-refresh" size="btr" @click="resetQuery"
+      <!-- <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button> -->
+      <!-- <el-button icon="el-icon-refresh" size="btr" @click="resetQuery"
           >重置</el-button
         >
       </el-form-item>
     </el-form> -->
 
-    <el-row :gutter="10" class="mb8">
+      <!-- <el-row :gutter="10" class="mb8"> -->
       <el-col :span="1.5">
         <el-button
           type="primary"
@@ -191,8 +210,8 @@
           >删除</el-button
         >
       </el-col>
-      <el-col :span="1.5">
-        <!-- <el-button
+      <!-- <el-col :span="1.5"> -->
+      <!-- <el-button
           type="warning"
           plain
           icon="el-icon-download"
@@ -202,104 +221,134 @@
           v-hasPermi="['thought:getready:export']"
           >导出</el-button
         > -->
-      </el-col>
+      <!-- </el-col> -->
       <right-toolbar
         :showSearch.sync="showSearch"
         @queryTable="getList"
       ></right-toolbar>
-    </el-row>
+      <!-- </el-row> -->
+      <el-col :span="20" :xs="24">
+        <el-table
+          v-loading="loading"
+          :data="getreadyList"
+          @selection-change="handleSelectionChange"
+        >
+          <el-table-column type="selection" width="55" align="center" />
+          <el-table-column
+            label="序号"
+            type="index"
+            width="50"
+            align="center"
+          />
+          <el-table-column
+            label="教育议题"
+            align="center"
+            prop="talkTheme"
+            show-overflow-tooltip
+          />
+          <el-table-column
+            label="教育议题简介"
+            align="center"
+            prop="talkIntroduction"
+            show-overflow-tooltip
+          />
+          <el-table-column
+            label="教育内容"
+            align="center"
+            prop="talkContent"
+            show-overflow-tooltip
+          >
+            <template slot-scope="scope">
+              <span>{{ onEditor(scope.row.talkContent) }}</span>
+            </template>
+          </el-table-column>
 
-    <el-table
-      v-loading="loading"
-      :data="getreadyList"
-      @selection-change="handleSelectionChange"
-    >
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="序号" type="index" width="50" align="center" />
-      <el-table-column label="教育议题" align="center" prop="talkTheme" show-overflow-tooltip/>
-       <el-table-column
-        label="教育议题简介"
-        align="center"
-        prop="talkIntroduction"
-        show-overflow-tooltip
-      />
-        <el-table-column label="教育内容" align="center" prop="talkContent" show-overflow-tooltip>
-        <template slot-scope="scope">
-          <span>{{ onEditor(scope.row.talkContent) }}</span>
-        </template>
-      </el-table-column>
-      
-      <el-table-column
-        label="开始时间"
-        align="center"
-        prop="startTime"
-        width="100"
-      >
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.startTime, "{y}-{m}-{d}") }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="组织人" align="center" prop="createName" width="100" />
-       <el-table-column label="记录人" align="center" prop="recorder" width="100" />
-       <el-table-column label="参加人" align="center" prop="talkPeople" show-overflow-tooltip :formatter="unit2Format"/>
-      <el-table-column
-        label="结束时间"
-        align="center"
-        prop="endTime"
-        width="100"
-      >
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.endTime, "{y}-{m}-{d}") }}</span>
-        </template>
-      </el-table-column>
-      
-      <!-- <el-table-column label="创建人id" align="center" prop="createId" /> -->
-      <!-- <el-table-column label="文件路径" align="center" prop="filePath" /> -->
-      <!-- <el-table-column label="文件名称" align="center" prop="fileName" show-overflow-tooltip/> -->
-    
-      
-     
-     
-      <!-- <el-table-column label="记录人id" align="center" prop="recorderId" /> -->
-      <el-table-column
-        label="操作"
-        align="center"
-        class-name="small-padding fixed-width"
-        width="200px"
-      >
-        <template slot-scope="scope">
-           <el-button
-            size="btk"
-            type="text"
-            @click="handlelook(scope.row)"
-            v-hasPermi="['thought:getready:edit']"
-            >查看</el-button
+          <el-table-column
+            label="开始时间"
+            align="center"
+            prop="startTime"
+            width="100"
           >
-          <el-button
-            size="btu"
-            type="text"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['thought:getready:edit']"
-            >修改</el-button
+            <template slot-scope="scope">
+              <span>{{ parseTime(scope.row.startTime, "{y}-{m}-{d}") }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            label="组织人"
+            align="center"
+            prop="createName"
+            width="100"
+          />
+          <el-table-column
+            label="记录人"
+            align="center"
+            prop="recorder"
+            width="100"
+          />
+          <el-table-column
+            label="参加人"
+            align="center"
+            prop="talkPeople"
+            show-overflow-tooltip
+            :formatter="unit2Format"
+          />
+          <el-table-column
+            label="结束时间"
+            align="center"
+            prop="endTime"
+            width="100"
           >
-          <el-button
-            size="btd"
-            type="text"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['thought:getready:remove']"
-            >删除</el-button
+            <template slot-scope="scope">
+              <span>{{ parseTime(scope.row.endTime, "{y}-{m}-{d}") }}</span>
+            </template>
+          </el-table-column>
+
+          <!-- <el-table-column label="创建人id" align="center" prop="createId" /> -->
+          <!-- <el-table-column label="文件路径" align="center" prop="filePath" /> -->
+          <!-- <el-table-column label="文件名称" align="center" prop="fileName" show-overflow-tooltip/> -->
+
+          <!-- <el-table-column label="记录人id" align="center" prop="recorderId" /> -->
+          <el-table-column
+            label="操作"
+            align="center"
+            class-name="small-padding fixed-width"
+            width="200px"
           >
-        </template>
-      </el-table-column>
-    </el-table>
+            <template slot-scope="scope">
+              <el-button
+                size="btk"
+                type="text"
+                @click="handlelook(scope.row)"
+                v-hasPermi="['thought:getready:edit']"
+                >查看</el-button
+              >
+              <el-button
+                size="btu"
+                type="text"
+                @click="handleUpdate(scope.row)"
+                v-hasPermi="['thought:getready:edit']"
+                >修改</el-button
+              >
+              <el-button
+                size="btd"
+                type="text"
+                @click="handleDelete(scope.row)"
+                v-hasPermi="['thought:getready:remove']"
+                >删除</el-button
+              >
+            </template>
+          </el-table-column>
+        </el-table>
 
-    <pagination
-      v-show="total > 0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
+        <pagination
+          v-show="total > 0"
+          :total="total"
+          :page.sync="queryParams.pageNum"
+          :limit.sync="queryParams.pageSize"
+          @pagination="getList"
+        />
+      </el-col>
+    </el-row>
 
     <!-- 添加或修改教育准备会对话框 -->
     <el-dialog
@@ -317,13 +366,9 @@
           label-width="100px"
           :inline="true"
         >
-        <div class="jiben">基本信息</div>
-           <el-form-item label="教育议题" prop="talkTheme">
-            <el-input
-              v-model="form.talkTheme"
-            
-              placeholder="请输入内容"
-            />
+          <div class="jiben">基本信息</div>
+          <el-form-item label="教育议题" prop="talkTheme">
+            <el-input v-model="form.talkTheme" placeholder="请输入内容" />
           </el-form-item>
           <el-form-item label="开始时间" prop="startTime">
             <el-date-picker
@@ -337,12 +382,7 @@
             >
             </el-date-picker>
           </el-form-item>
-          <el-form-item
-            label="结束时间"
-            prop="endTime"
-            label-width="115px"
-         
-          >
+          <el-form-item label="结束时间" prop="endTime" label-width="115px">
             <el-date-picker
               editable
               clearable
@@ -359,8 +399,8 @@
               v-model="form.createName"
               placeholder="请选择用户名称"
             /> -->
-             <el-select
-             filterable
+            <el-select
+              filterable
               v-model="form.createName"
               ref="createName"
               placeholder="请选择组织人"
@@ -377,7 +417,7 @@
           <!-- <el-form-item label="创建人id" prop="createId">
           <el-input v-model="form.createId" placeholder="请输入创建人id" />
         </el-form-item> -->
-          
+
           <!-- <el-form-item label="文件名称" prop="fileName">
             <el-input v-model="form.fileName" placeholder="请输入文件名称" />
           </el-form-item>
@@ -386,19 +426,18 @@
           </el-form-item> -->
           <el-form-item label="记录人" prop="recorder">
             <!-- <el-input v-model="form.recorder" placeholder="请输入记录人" /> -->
-             <el-select
+            <el-select
               v-model="form.recorder"
               ref="recorder"
               placeholder="请选择记录人"
               filterable
-              
             >
               <el-option
                 v-for="item in recodeexecutor"
                 :key="item.id"
                 :label="item.name"
                 :value="item.name"
-                 @click.native="jiluPeople(item.id)"
+                @click.native="jiluPeople(item.id)"
               />
             </el-select>
           </el-form-item>
@@ -433,7 +472,7 @@
             />
           </el-form-item>
           <!-- <div class="jiben">会议主题</div> -->
-         
+
           <div class="jiben">教育内容</div>
           <el-form-item>
             <!-- <editor v-model="form.talkContent" :min-height="192"/> -->
@@ -462,10 +501,10 @@
             ></quill-editor>
           </el-form-item>
           <div class="jiben">附件</div>
-           <el-form-item>
-          <FileUpload v-model="form.fileName" />
-           </el-form-item>
-           <!-- <el-input
+          <el-form-item>
+            <FileUpload v-model="form.fileName" />
+          </el-form-item>
+          <!-- <el-input
               v-model="form.fileName"
              
             /> -->
@@ -492,8 +531,8 @@
           label-width="100px"
           :inline="true"
         >
-        <div class="jiben">基本信息</div>
-           <el-form-item label="教育议题" prop="talkTheme">
+          <div class="jiben">基本信息</div>
+          <el-form-item label="教育议题" prop="talkTheme">
             <el-input
               v-model="form1.talkTheme"
               disabled
@@ -513,14 +552,9 @@
             >
             </el-date-picker>
           </el-form-item>
-          <el-form-item
-            label="结束时间"
-            prop="endTime"
-            label-width="115px"
-         
-          >
+          <el-form-item label="结束时间" prop="endTime" label-width="115px">
             <el-date-picker
-            disabled
+              disabled
               editable
               clearable
               size="small"
@@ -532,9 +566,9 @@
             </el-date-picker>
           </el-form-item>
           <el-form-item label="组织人" prop="createName">
-             <el-select
-             disabled
-             filterable
+            <el-select
+              disabled
+              filterable
               v-model="form1.createName"
               ref="createName"
               placeholder="请选择组织人"
@@ -549,26 +583,25 @@
             </el-select>
           </el-form-item>
           <el-form-item label="记录人" prop="recorder">
-             <el-select
-             disabled
+            <el-select
+              disabled
               v-model="form1.recorder"
               ref="recorder"
               placeholder="请选择记录人"
               filterable
-              
             >
               <el-option
                 v-for="item in recodeexecutor"
                 :key="item.id"
                 :label="item.name"
                 :value="item.name"
-                 @click.native="jiluPeople(item.id)"
+                @click.native="jiluPeople(item.id)"
               />
             </el-select>
           </el-form-item>
           <el-form-item label="参加人" prop="talkPeople" label-width="100px">
             <el-select
-            disabled
+              disabled
               v-model="form1.talkPeople"
               ref="peoplenames"
               placeholder="请选择参加人"
@@ -589,7 +622,6 @@
           <el-form-item prop="talkIntroduction">
             <el-input
               disabled
-              
               v-model="form1.talkIntroduction"
               type="textarea"
               placeholder="请输入内容"
@@ -598,7 +630,7 @@
           <div class="jiben">教育内容</div>
           <el-form-item>
             <quill-editor
-            disabled
+              disabled
               class="quill-editor"
               ref="myTextEditor"
               v-model="form1.talkContent"
@@ -612,26 +644,26 @@
             ></quill-editor>
           </el-form-item>
           <div class="jiben">附件</div>
-           <el-form-item>
-          <!-- <FileUpload v-model="form1.fileName" /> -->
-          <span class="filename">{{form1.fileName}}</span>
-           <a
-            :href="form1.filePath"
-            download
-            title="下载"
-            style="color: white; margin-left: 10px"
-            class="downloadfile"
-            >下载附件</a
-          >
-           </el-form-item>
+          <el-form-item>
+            <!-- <FileUpload v-model="form1.fileName" /> -->
+            <span class="filename">{{ form1.fileName }}</span>
+            <a
+              :href="form1.filePath"
+              download
+              title="下载"
+              style="color: white; margin-left: 10px"
+              class="downloadfile"
+              >下载附件</a
+            >
+          </el-form-item>
         </el-form>
       </div>
       <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="open1=false">关 闭</el-button>
+        <el-button type="primary" @click="open1 = false">关 闭</el-button>
         <!-- <el-button @click="open1=false" size="btn">取 消</el-button> -->
       </div>
     </el-dialog>
-    </div>
+    <!-- </div> -->
   </div>
 </template>
 
@@ -652,12 +684,10 @@ import {
   updateBdgldiary,
   exportBdgldiary,
   exportBdgShuju,
-  updateBdglShenPi
+  updateBdglShenPi,
 } from "@/api/grassrootsregistration/bdgldiary";
-import {
-  allUser,
-} from "@/api/workingArrangements/workTask";
-import {  getAll,getWeiShu } from "@/api/grassrootsregistration/bdglmeeting";
+import { allUser } from "@/api/workingArrangements/workTask";
+import { getAll, getWeiShu } from "@/api/grassrootsregistration/bdglmeeting";
 // 富文本
 import "quill/dist/quill.core.css";
 import "quill/dist/quill.snow.css";
@@ -667,7 +697,7 @@ export default {
   name: "Getready",
   data() {
     return {
-      tiem:"",
+      tiem: "",
       // 遮罩层
       loading: true,
       // 导出遮罩层
@@ -709,50 +739,50 @@ export default {
       form: {},
       // 表单校验
       rules: {
-         talkTheme: [
-          { required: true, message: "教育议题不能为空", trigger: "blur" }
+        talkTheme: [
+          { required: true, message: "教育议题不能为空", trigger: "blur" },
         ],
         startTime: [
-          { required: true, message: "开始时间不能为空", trigger: "blur" }
+          { required: true, message: "开始时间不能为空", trigger: "blur" },
         ],
         endTime: [
-          { required: true, message: "结束时间不能为空", trigger: "blur" }
+          { required: true, message: "结束时间不能为空", trigger: "blur" },
         ],
         createName: [
-          { required: true, message: "组织人不能为空", trigger: "blur" }
+          { required: true, message: "组织人不能为空", trigger: "blur" },
         ],
         recorder: [
-          { required: true, message: "记录人不能为空", trigger: "blur" }
+          { required: true, message: "记录人不能为空", trigger: "blur" },
         ],
         talkPeople: [
-          { required: true, message: "参加人不能为空", trigger: "blur" }
+          { required: true, message: "参加人不能为空", trigger: "blur" },
         ],
       },
       // 获取人员
       executors: [],
       // 记录人
-      recodeexecutor:[],
+      recodeexecutor: [],
       // 添加列表的人员
       executor: [],
       // 左侧树形
-      deptOptions:[],
+      deptOptions: [],
       //左侧时间选择
       pickerOptions: {
         disabledDate(time) {
           return time.getTime() > Date.now();
-        }
+        },
       },
-       // 树形配置
+      // 树形配置
       defaultProps: {
         children: "children",
-        label: "label"
+        label: "label",
       },
       // 搜索时间的保存
       timeDate: "",
-      rylist:[],
-       form1:{},
-      open1:false,
-      title1:""
+      rylist: [],
+      form1: {},
+      open1: false,
+      title1: "",
     };
   },
   components: {
@@ -770,36 +800,35 @@ export default {
   },
   methods: {
     // 获取执行人
-    unit2Format(row){
-      var deptName=""
+    unit2Format(row) {
+      var deptName = "";
       this.recodeexecutor.map((item) => {
         // console.log(row.talkPeople)
-          row.talkPeople.split(",").forEach((items, index) => {
-            // console.log(item.id,item.name)
-            if (item.id == items) {
-              deptName += item.name + "  ";
-            }
-          });
+        row.talkPeople.split(",").forEach((items, index) => {
+          // console.log(item.id,item.name)
+          if (item.id == items) {
+            deptName += item.name + "  ";
+          }
         });
-        return deptName
+      });
+      return deptName;
     },
-    returnExecutor(id,name){
+    returnExecutor(id, name) {
       // this.form.talkPeople=id
       // console.log(id)
       // console.log()
-      
     },
-    zuzhiPeople(id){
+    zuzhiPeople(id) {
       // console.log(id)
-      this.form.createId=id
+      this.form.createId = id;
     },
-    jiluPeople(id){
-      this.form.recorderId=id
+    jiluPeople(id) {
+      this.form.recorderId = id;
       // console.log(id)
     },
     // 获取部门数据
     getShuJu(data) {
-      exportBdgShuju(data).then(res => {
+      exportBdgShuju(data).then((res) => {
         this.DataTime = data;
         this.registrationData = res;
         this.cg = res.cg;
@@ -818,9 +847,9 @@ export default {
     },
     // 获取外面部门树形
     treeselect() {
-      getWeiShu().then(res => {
+      getWeiShu().then((res) => {
         this.deptOptions = res.data;
-        console.log(this.deptOptions)
+        console.log(this.deptOptions);
       });
     },
     //外面树形选择搜索
@@ -834,9 +863,9 @@ export default {
       getAll().then((response) => {
         this.executors = response.rows;
         // 添加的人员
-        this.executor=response.rows
+        this.executor = response.rows;
         // 记录人
-        this.recodeexecutor=response.rows
+        this.recodeexecutor = response.rows;
         // console.log(this.executors);
       });
     },
@@ -920,24 +949,25 @@ export default {
       });
     },
     // 查看按钮操作
-    handlelook(row){
-      console.log(row)
+    handlelook(row) {
+      console.log(row);
       this.reset();
-      const id = row.id || this.ids
-       getGetready(id).then(response => {
+      const id = row.id || this.ids;
+      getGetready(id).then((response) => {
         this.form1 = response.data;
-         this.form1.talkPeople = this.form1.talkPeople.split(",").map(Number);
-         this.form1.filePath=process.env.VUE_APP_BASE_API+this.form1.filePath
-         console.log(this.form1)
+        this.form1.talkPeople = this.form1.talkPeople.split(",").map(Number);
+        this.form1.filePath =
+          process.env.VUE_APP_BASE_API + this.form1.filePath;
+        console.log(this.form1);
         this.open1 = true;
         this.title1 = "查看教育准备会";
       });
     },
     /** 提交按钮 */
     submitForm() {
-      if(this.form.fileName){
-      this.form.filePath=this.form.fileName[0].url
-      this.form.fileName=this.form.fileName[0].name
+      if (this.form.fileName) {
+        this.form.filePath = this.form.fileName[0].url;
+        this.form.fileName = this.form.fileName[0].name;
       }
       this.form.talkPeople = this.form.talkPeople.join(",");
       this.form.talkPeopleId = this.form.talkPeople;
@@ -1001,13 +1031,13 @@ export default {
   height: auto;
   min-height: 30px;
   text-indent: 1em;
-  padding:2px;
+  padding: 2px;
   line-height: 30px;
   margin-bottom: 20px;
   /* margin: auto; */
 }
 /* 附件名称样式 */
-.filename{
+.filename {
   display: inline-block;
   color: white;
   width: 900px;
@@ -1027,31 +1057,31 @@ export default {
   text-align: center;
 }
 
-::v-deep .el-pagination__sizes .el-input__suffix{
+::v-deep .el-pagination__sizes .el-input__suffix {
   right: 6px;
 }
-::v-deep .ql-snow .ql-picker-options .ql-picker-item:focus{
+::v-deep .ql-snow .ql-picker-options .ql-picker-item:focus {
   outline: none !important;
 }
-::v-deep .ql-snow .ql-picker:focus{
-   outline: none !important;
+::v-deep .ql-snow .ql-picker:focus {
+  outline: none !important;
 }
-::v-deep .ql-toolbar.ql-snow .ql-picker.ql-expanded .ql-picker-label:focus{
+::v-deep .ql-toolbar.ql-snow .ql-picker.ql-expanded .ql-picker-label:focus {
   outline: none !important;
 }
-::v-deep .ql-toolbar.ql-snow .ql-picker-label{
+::v-deep .ql-toolbar.ql-snow .ql-picker-label {
   border: none !important;
 }
-::v-deep .ql-formats:focus{
+::v-deep .ql-formats:focus {
   outline: none !important;
 }
-::v-deep .ql-toolbar.ql-snow .ql-picker.ql-expanded .ql-picker-options{
+::v-deep .ql-toolbar.ql-snow .ql-picker.ql-expanded .ql-picker-options {
   border-color: none !important;
   color: black !important;
 }
 /* normal */
-::v-deep .ql-active{
- outline: none !important;
+::v-deep .ql-active {
+  outline: none !important;
 }
 /* 输入框 */
 ::v-deep .el-dialog .el-input__inner {
@@ -1119,14 +1149,14 @@ export default {
 ::v-deep .ql-editor ql-blank {
   color: #fff !important;
 }
-::v-deep .ql-snow .ql-picker-label{
+::v-deep .ql-snow .ql-picker-label {
   position: absolute;
   bottom: 5px;
 }
-::v-deep .ql-snow .ql-picker:not(.ql-color-picker):not(.ql-icon-picker) svg{
+::v-deep .ql-snow .ql-picker:not(.ql-color-picker):not(.ql-icon-picker) svg {
   margin-top: -2px;
 }
-::v-deep .ql-toolbar.ql-snow{
+::v-deep .ql-toolbar.ql-snow {
   display: flex;
   justify-content: space-around;
 }
@@ -1238,7 +1268,7 @@ export default {
   right: 281px;
 }
 /* 头部样式 */
-.box-lfet .dadui {
+.dadui {
   height: 40px;
   background: #003156;
   /* border-bottom: 1px solid #718A9D ; */
@@ -1248,7 +1278,7 @@ export default {
   font-size: 16px;
   color: #1d96ff;
 }
-.box-lfet .dadui img {
+.dadui img {
   margin: 10px 10px 0px 10px;
 }
 
@@ -1309,21 +1339,24 @@ export default {
 ::v-deep .el-dialog {
   background-color: #004d86 !important;
 }
-::v-deep .el-input__suffix{
+::v-deep .el-input__suffix {
   right: 22px;
 }
-::v-deep .el-tree-node__content{
+::v-deep .el-tree-node__content {
   height: 32px;
 }
-::v-deep .el-tree--highlight-current .el-tree-node.is-current > .el-tree-node__content{
+::v-deep
+  .el-tree--highlight-current
+  .el-tree-node.is-current
+  > .el-tree-node__content {
   height: 32px;
   color: #fff !important;
   background-color: #003156;
-   background-image: url("../../../assets/images/选中.png");
-    background-size: 100% 100%;
-    background-repeat: no-repeat
+  background-image: url("../../../assets/images/选中.png");
+  background-size: 100% 100%;
+  background-repeat: no-repeat;
 }
-::v-deep .canjiaren .el-input__inner{
+::v-deep .canjiaren .el-input__inner {
   width: 560px;
 }
 /* 计划附件 */
@@ -1335,8 +1368,8 @@ export default {
   left: 90px;
   color: white;
 }
-::v-deep .el-link.el-link--default{
-  color: white ;
+::v-deep .el-link.el-link--default {
+  color: white;
   text-indent: 0.5em;
 }
 /* ::v-deep .el-upload__tip {
@@ -1361,7 +1394,7 @@ export default {
 /* ::v-deep .el-select-dropdown__item {
   color: white;
 }  */
-::v-deep .el-form-item__content .el-textarea .el-textarea__inner{
-   color: white !important;
+::v-deep .el-form-item__content .el-textarea .el-textarea__inner {
+  color: white !important;
 }
 </style>

Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 330 - 242
src/views/thought/parliament/index.vue


+ 164 - 123
src/views/thought/responses/index.vue

@@ -112,7 +112,7 @@
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>-->
-    <div class="box-lfet">
+    <!-- <div class="box-lfet">
       <div class="dadui">
         <img src="../../../images/星星.png" alt />
         大队
@@ -130,7 +130,26 @@
         ></el-tree>
       </div>
     </div>
-    <div class="box-right">
+    <div class="box-right"> -->
+    <el-row :gutter="20">
+      <el-col :span="4" :xs="24">
+        <div class="dadui">
+          <img src="../../../images/星星.png" alt />
+          大队
+        </div>
+        <div class="tree">
+          <el-tree
+            class="userAgrees"
+            style="height: 700px; overflow: auto"
+            :data="deptOptions"
+            :props="defaultProps"
+            @node-click="handleNodeClick"
+            default-expand-all
+            highlight-current
+            :expand-on-click-node="false"
+          ></el-tree>
+        </div>
+      </el-col>
       <!-- <el-row :gutter="10" class="mb8">
         <el-col :span="1.5">
           <el-button
@@ -180,128 +199,139 @@
           >
         </el-col>
       </el-row> -->
-
-      <el-table
-        v-loading="loading"
-        :header-cell-style="{ background: '#003C69', color: 'white' }"
-        :data="thoughtPlanList"
-        max-width="10"
-        @selection-change="handleSelectionChange"
-      >
-        <el-table-column type="selection" width="55" align="center" />
-        <el-table-column label="序号" align="center" type="index" />
-        <!-- <el-table-column label="主键id" align="center" prop="id" /> -->
-        <el-table-column label="计划名称" align="center" prop="planName" />
-        <el-table-column
-          label="计划简介"
-          align="center"
-          prop="planIntroduction"
-        />
-        <el-table-column
-          label="计划开始时间"
-          align="center"
-          prop="planStartTime"
-          width="120"
+      <el-col :span="20" :xs="24">
+        <el-table
+          v-loading="loading"
+          :header-cell-style="{ background: '#003C69', color: 'white' }"
+          :data="thoughtPlanList"
+          @selection-change="handleSelectionChange"
         >
-          <template slot-scope="scope">
-            <span>{{ parseTime(scope.row.planStartTime, "{y}-{m}-{d}") }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column
-          label="计划结束时间"
-          align="center"
-          prop="planEndTime"
-          width="120"
-        >
-          <template slot-scope="scope">
-            <span>{{ parseTime(scope.row.planEndTime, "{y}-{m}-{d}") }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="计划个数" align="center" prop="planNumber" />
-        <el-table-column
-          label="需响应计划数"
-          align="center"
-          prop="planNumber"
-        />
-        <el-table-column
-          label="已响应计划数"
-          align="center"
-          prop="responseNumber"
-        />
-        <el-table-column label="计划状态" align="center" prop="state">
-          <template slot-scope="scope">
-            <span v-if="scope.row.state == '0'" style="color: #00eaff"
-              >未响应</span
-            >
-            <span v-if="scope.row.state == '1'" style="color: #13ce66"
-              >已完成</span
-            >
-            <span v-if="scope.row.state == '2'" style="color: #ffba00"
-              >已审批</span
-            >
-            <span
-              v-if="scope.row.state == '3'"
-              style="color: #ff4949"
-              :title="scope.row.reasons"
-              >已驳回</span
-            >
-            <span v-if="scope.row.state == '4'" style="color: #00eaff"
-              >进行中</span
-            >
-          </template>
-        </el-table-column>
-        <el-table-column
-          label="创建时间"
-          align="center"
-          prop="createTime"
-          width="120"
-        >
-          <template slot-scope="scope">
-            <span>{{ parseTime(scope.row.createTime, "{y}-{m}-{d}") }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column
-          fixed="right"
-          width="200"
-          label="操作"
-          align="center"
-          class-name="small-padding fixed-width"
-        >
-          <template slot-scope="scope">
-            <el-button
-              v-if="scope.row.state == '1'"
-              size="btc"
-              type="text"
-              @click="handleUpdate1(scope.row)"
-              v-hasPermi="['thought:thoughtPlan:edit']"
-              >审批</el-button
-            >
-            <el-button
-              size="btc"
-              type="text"
-              @click="handleUpdate(scope.row)"
-              v-hasPermi="['thought:thoughtPlan:edit']"
-              >查看</el-button
-            >
-            <!-- <el-button
+          <el-table-column type="selection" width="55" align="center" />
+          <el-table-column label="序号" align="center" type="index" />
+          <!-- <el-table-column label="主键id" align="center" prop="id" /> -->
+          <el-table-column
+            label="计划名称"
+            align="center"
+            prop="planName"
+            width="120"
+          />
+          <el-table-column
+            label="计划简介"
+            align="center"
+            prop="planIntroduction"
+            width="150"
+          />
+          <el-table-column
+            label="计划开始时间"
+            align="center"
+            prop="planStartTime"
+            width="150"
+          >
+            <template slot-scope="scope">
+              <span>{{
+                parseTime(scope.row.planStartTime, "{y}-{m}-{d}")
+              }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            label="计划结束时间"
+            align="center"
+            prop="planEndTime"
+            width="150"
+          >
+            <template slot-scope="scope">
+              <span>{{ parseTime(scope.row.planEndTime, "{y}-{m}-{d}") }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="计划个数" align="center" prop="planNumber" />
+          <el-table-column
+            label="需响应计划数"
+            align="center"
+            prop="planNumber"
+            width="120"
+          />
+          <el-table-column
+            label="已响应计划数"
+            align="center"
+            prop="responseNumber"
+            width="120"
+          />
+          <el-table-column label="计划状态" align="center" prop="state">
+            <template slot-scope="scope">
+              <span v-if="scope.row.state == '0'" style="color: #00eaff"
+                >未响应</span
+              >
+              <span v-if="scope.row.state == '1'" style="color: #13ce66"
+                >已完成</span
+              >
+              <span v-if="scope.row.state == '2'" style="color: #ffba00"
+                >已审批</span
+              >
+              <span
+                v-if="scope.row.state == '3'"
+                style="color: #ff4949"
+                :title="scope.row.reasons"
+                >已驳回</span
+              >
+              <span v-if="scope.row.state == '4'" style="color: #00eaff"
+                >进行中</span
+              >
+            </template>
+          </el-table-column>
+          <el-table-column
+            label="创建时间"
+            align="center"
+            prop="createTime"
+            width="120"
+          >
+            <template slot-scope="scope">
+              <span>{{ parseTime(scope.row.createTime, "{y}-{m}-{d}") }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            width="200"
+            label="操作"
+            align="center"
+            class-name="small-padding fixed-width"
+            fixed="right"
+          >
+            <template slot-scope="scope">
+              <el-button
+                v-if="scope.row.state == '1'"
+                size="btc"
+                type="text"
+                @click="handleUpdate1(scope.row)"
+                v-hasPermi="['thought:thoughtPlan:edit']"
+                >审批</el-button
+              >
+              <el-button
+                size="btc"
+                type="text"
+                @click="handleUpdate(scope.row)"
+                v-hasPermi="['thought:thoughtPlan:edit']"
+                >查看</el-button
+              >
+              <!-- <el-button
               size="btc"
               type="text"
               @click="handleDelete(scope.row)"
               v-hasPermi="['thought:thoughtPlan:remove']"
               >删除</el-button
             > -->
-          </template>
-        </el-table-column>
-      </el-table>
+            </template>
+          </el-table-column>
+        </el-table>
 
-      <pagination
-        v-show="total > 0"
-        :total="total"
-        :page.sync="queryParams.pageNum"
-        :limit.sync="queryParams.pageSize"
-        @pagination="getList"
-      />
-    </div>
+        <pagination
+          v-show="total > 0"
+          :total="total"
+          :page.sync="queryParams.pageNum"
+          :limit.sync="queryParams.pageSize"
+          @pagination="getList"
+        />
+        <!-- </div> -->
+      </el-col>
+    </el-row>
 
     <!-- 添加或修改月教育计划对话框 -->
     <el-dialog
@@ -468,7 +498,7 @@
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm1">审批</el-button>
+        <el-button type="primary" @click="submitForm1">通过</el-button>
         <el-button @click="submitFormBoHui" size="btn">驳回</el-button>
       </div>
     </el-dialog>
@@ -566,7 +596,7 @@ import {
 import { getWeiShu } from "@/api/grassrootsregistration/bdglmeeting";
 
 export default {
-  name: "ThoughtPlan",
+  name: "responses",
   data() {
     return {
       // 遮罩层
@@ -574,6 +604,7 @@ export default {
       tiem: null,
       // 导出遮罩层
       exportLoading: false,
+      url: process.env.VUE_APP_BASE_API,
       // 选中数组
       ids: [],
       // 非单个禁用
@@ -1086,7 +1117,7 @@ export default {
   right: 281px;
 }
 /* 头部样式 */
-.box-lfet .dadui {
+.dadui {
   height: 40px;
   background: #003156;
   /* border-bottom: 1px solid #718A9D ; */
@@ -1096,16 +1127,16 @@ export default {
   font-size: 16px;
   color: #1d96ff;
 }
-.box-lfet .dadui img {
+.dadui img {
   margin: 10px 10px 0px 10px;
 }
 
-.box-lfet .data p {
+.data p {
   position: absolute;
   top: -5px;
   left: 15px;
 }
-.box-lfet .data .a1 {
+.data .a1 {
   width: 128px;
   height: 26px;
   background: rgba(23, 74, 112, 0.4);
@@ -1196,7 +1227,17 @@ export default {
 ::v-deep .el-dialog__footer {
   margin-right: 54px;
 }
-::v-deep th{
+::v-deep th {
   background: #004d86 !important;
 }
+/* 下载按钮 */
+.downloadfile {
+  border: 1px solid white;
+  display: inline-block;
+  width: 100px;
+  height: 36px;
+  border-radius: 5px;
+  line-height: 33px;
+  text-align: center;
+}
 </style>

Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 422 - 392
src/views/thought/talk/index.vue


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 451 - 323
src/views/thought/thoughtPlan/index.vue


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 544 - 514
src/views/thought/weekjob/index.vue


Niektoré súbory nie sú zobrazené, pretože je v týchto rozdielových dátach zmenené mnoho súborov