Преглед на файлове

手机柜样式完成,菜单图标上传,主页图标的更改

sunyanqiang преди 3 години
родител
ревизия
fe4ca53678

+ 0 - 9
FeatureSuggester.xml

@@ -1,9 +0,0 @@
-<application>
-  <component name="FeatureSuggesterSettings">
-    <option name="workingDays">
-      <list>
-        <option value="1650590180170" />
-      </list>
-    </option>
-  </component>
-</application>

+ 0 - 5
colors.scheme.xml

@@ -1,5 +0,0 @@
-<application>
-  <component name="EditorColorsManagerImpl">
-    <global_color_scheme name="GitHub Dark (Material)" />
-  </component>
-</application>

+ 0 - 3
databaseDrivers.xml

@@ -1,3 +0,0 @@
-<application>
-  <component name="LocalDatabaseDriverManager" version="201" />
-</application>

+ 0 - 13
debugger.xml

@@ -1,13 +0,0 @@
-<application>
-  <component name="XDebuggerSettings">
-    <data-views />
-    <general />
-    <debuggers>
-      <debugger id="javascript">
-        <configuration>
-          <custom-object-presentation />
-        </configuration>
-      </debugger>
-    </debuggers>
-  </component>
-</application>

+ 0 - 7
editor-font.xml

@@ -1,7 +0,0 @@
-<application>
-  <component name="DefaultFont">
-    <option name="VERSION" value="1" />
-    <option name="FONT_REGULAR_SUB_FAMILY" value="Regular" />
-    <option name="FONT_BOLD_SUB_FAMILY" value="Bold" />
-  </component>
-</application>

+ 0 - 6
editor.xml

@@ -1,6 +0,0 @@
-<application>
-  <component name="TodoConfiguration">
-    <pattern pattern="\btodo\b.*" />
-    <pattern pattern="\bfixme\b.*" />
-  </component>
-</application>

+ 0 - 5
filetypes.xml

@@ -1,5 +0,0 @@
-<application>
-  <component name="FileTypeManager" version="18">
-    <ignoreFiles list="*$py.class;*.pyc;*.pyo;*.rbc;*.yarb;*~;.DS_Store;.git;.hg;.svn;CVS;__pycache__;_svn;vssver.scc;vssver2.scc" />
-  </component>
-</application>

+ 0 - 9
find.xml

@@ -1,9 +0,0 @@
-<application>
-  <component name="FindSettings">
-    <mask>*.css</mask>
-    <mask>*.html</mask>
-    <mask>*.xml</mask>
-    <mask>*.pyw</mask>
-    <mask>*.py</mask>
-  </component>
-</application>

+ 0 - 6
ide.general.xml

@@ -1,6 +0,0 @@
-<application>
-  <component name="Registry">
-    <entry key="ide.balloon.shadow.size" value="0" />
-    <entry key="ide.experimental.ui" value="false" />
-  </component>
-</application>

+ 0 - 5
laf.xml

@@ -1,5 +0,0 @@
-<application>
-  <component name="LafManager" autodetect="false">
-    <laf class-name="com.intellij.ide.ui.laf.darcula.DarculaLaf" themeId="GITHUB_DARK" />
-  </component>
-</application>

+ 0 - 9
material_theme.xml

@@ -1,9 +0,0 @@
-<application>
-  <component name="MaterialThemeConfig">
-    <option name="pristineConfig" value="false" />
-    <option name="accentColor" value="f9826c" />
-    <option name="selectedTheme" value="GITHUB_DARK" />
-    <option name="userId" value="2bb7062e:18045d6d6c4:-7e85" />
-    <option name="version" value="7.3.2" />
-  </component>
-</application>

+ 0 - 5
nodejs.xml

@@ -1,5 +0,0 @@
-<application>
-  <component name="NodeJsLocalInterpreterManager">
-    <local-interpreter path="D:/Development/node/node.exe" />
-  </component>
-</application>

+ 16 - 0
src/api/phone/cabinet.js

@@ -50,4 +50,20 @@ export function exportCabinet(query) {
     method: 'get',
     params: query
   })
+}
+// 查询详情手机柜列表
+export function shouJiGrid(query) {
+  return request({
+    url: '/phone/grid/getNumber',
+    method: 'get',
+    params: query
+  })
+}
+// 查询手机柜格子列表
+export function listGrid(query) {
+  return request({
+    url: '/phone/grid/list',
+    method: 'get',
+    params: query
+  })
 }

+ 12 - 9
src/api/phone/grid.js

@@ -1,13 +1,6 @@
 import request from '@/utils/request'
 
-// 查询手机柜格子列表
-export function listGrid(query) {
-  return request({
-    url: '/phone/grid/list',
-    method: 'get',
-    params: query
-  })
-}
+
 
 // 查询手机柜格子详细
 export function getGrid(id) {
@@ -50,4 +43,14 @@ export function exportGrid(query) {
     method: 'get',
     params: query
   })
-}
+}
+
+// 导出手机柜格子
+export function aaa(query) {
+  return request({
+    url: '/yyy/aaa/list',
+    method: 'get',
+    params: query
+  })
+}
+

+ 2 - 0
src/assets/icons/svg/保密设备外借记录.svg

@@ -0,0 +1,2 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1650704122370" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4174" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css">@font-face { font-family: feedback-iconfont; src: url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff2?t=1630033759944") format("woff2"), url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff?t=1630033759944") format("woff"), url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.ttf?t=1630033759944") format("truetype"); }
+</style></defs><path d="M669.184 213.504H275.456c-18.432-0.512-34.304 14.336-34.816 32.768 0 17.92 15.36 32.768 34.816 32.768h393.216c18.432 0.512 34.304-14.336 34.816-32.768 0-17.92-15.36-32.768-34.304-32.768z m-107.008 182.784h-286.72c-18.432-0.512-34.304 14.336-34.816 32.768 0 17.92 15.36 32.768 34.816 32.768h286.72c18.432 0.512 34.304-14.336 34.816-32.768 0-18.432-15.36-32.768-34.816-32.768zM374.272 578.56H275.968c-18.432-0.512-34.304 14.336-34.816 32.768 0 17.92 15.36 32.768 34.816 32.768h98.816c18.432 0.512 34.304-14.336 34.816-32.768-0.512-18.432-15.872-32.768-35.328-32.768z" fill="#FFFFFF" p-id="4175"></path><path d="M419.328 971.264H203.776c-67.072 0-121.856-51.712-121.856-115.2v-691.2C81.92 101.376 136.704 49.664 203.776 49.664h536.576c67.072 0 121.856 51.712 121.856 115.2v249.344c0 17.92-15.36 32.768-34.816 32.768-18.432 0.512-34.304-14.336-34.816-32.768V164.864c0-27.136-23.552-49.152-52.224-49.152H203.776c-28.672 0-52.224 22.016-52.224 49.152v691.2c0 27.136 23.552 49.152 52.224 49.152h215.552c19.456 0 34.816 14.848 34.816 32.768 0 18.944-15.36 33.28-34.816 33.28z" fill="#FFFFFF" p-id="4176"></path><path d="M870.4 756.736v-55.808c0-61.44-49.152-111.616-109.568-111.616-60.416 0-109.568 49.664-109.568 111.616 0 15.36 12.288 27.648 27.648 27.648 15.36 0 27.648-12.8 27.648-27.648 0-30.72 24.576-55.296 54.784-55.808 30.208 0 54.784 25.088 54.784 55.808v55.808h-164.864c-30.72 0-55.296 25.088-54.784 55.808V896c0 30.72 24.576 55.296 54.784 55.808H870.4c30.72 0 55.296-25.088 54.784-55.808v-83.456c0-30.72-24.576-55.808-54.784-55.808z m0 139.264h-219.648v-83.456H870.4V896z" fill="#FFFFFF" p-id="4177"></path></svg>

+ 2 - 0
src/assets/icons/svg/党委议教会.svg

@@ -0,0 +1,2 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1650703453318" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4242" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css">@font-face { font-family: feedback-iconfont; src: url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff2?t=1630033759944") format("woff2"), url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff?t=1630033759944") format("woff"), url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.ttf?t=1630033759944") format("truetype"); }
+</style></defs><path d="M810.496 41.472c78.336 0 141.824 66.56 141.824 148.48v637.952c0 81.92-63.488 148.48-141.824 148.48H218.112c-78.336 0-141.824-66.56-141.824-148.48V189.952c0-81.92 63.488-148.48 141.824-148.48h592.384z m14.848 72.704H203.776c-29.696 0-53.76 25.088-54.272 56.32v676.352c0 31.232 23.552 56.832 53.248 57.344H825.344c29.696 0 53.76-25.088 54.272-56.32V171.52c0-31.232-23.552-56.832-53.248-57.344h-1.024zM479.232 690.176c19.456 0 35.328 15.872 35.328 35.328 0 19.456-15.872 35.328-35.328 35.328H320c-19.456 0-35.328-15.872-35.328-35.328 0-19.456 15.872-35.328 35.328-35.328h159.232z m229.888-218.624c19.456 0 35.328 15.872 35.328 35.328 0 19.456-15.872 35.328-35.328 35.328h-389.12c-19.456 0-35.328-15.872-35.328-35.328 0-19.456 15.872-35.328 35.328-35.328h389.12zM383.488 202.24L409.6 255.488l58.368 8.704-42.496 41.472 10.24 58.368-52.224-27.648L330.752 363.52l10.24-58.368-42.496-41.472 58.368-8.704 26.624-52.736z m325.632 55.296c19.456 0 35.328 15.872 35.328 35.328 0 19.456-15.872 35.328-35.328 35.328h-159.232c-19.456 0-35.328-15.872-35.328-35.328 0-19.456 15.872-35.328 35.328-35.328h159.232z" fill="#FFFFFF" p-id="4243"></path></svg>

+ 2 - 0
src/assets/icons/svg/周工作.svg

@@ -0,0 +1,2 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1650703469686" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4502" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css">@font-face { font-family: feedback-iconfont; src: url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff2?t=1630033759944") format("woff2"), url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff?t=1630033759944") format("woff"), url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.ttf?t=1630033759944") format("truetype"); }
+</style></defs><path d="M859.136 912.896H165.888c-72.192 0-130.56-59.392-130.56-132.608V316.928C35.328 243.712 93.696 184.32 165.888 184.32h693.76c72.192 0 130.56 59.392 130.56 132.608v463.36c0 73.216-58.88 132.608-131.072 132.608zM165.888 256c-33.28 0-60.416 27.136-60.416 60.928v463.36c0 33.792 27.136 60.928 60.416 60.928h693.76c33.28 0 60.416-27.136 60.416-60.928V316.928c0-33.792-27.136-60.928-60.416-60.928H165.888z" fill="#FFFFFF" p-id="4503"></path><path d="M693.248 249.856c-19.456 0-35.328-16.384-35.328-35.84v-50.688c0-8.192-6.656-14.336-14.336-14.848H381.952c-8.192 0-14.336 6.656-14.336 14.848v50.688c0 19.968-15.872 35.84-35.328 35.84-19.456 0-35.328-16.384-35.328-35.84v-50.688C296.96 115.712 335.36 76.8 381.952 76.8h261.632c47.104 0 84.992 38.912 84.992 86.528v50.688c0 19.456-15.872 35.328-35.328 35.84z m-299.52 294.912H80.384c-19.456 0-35.328-16.384-35.328-35.84s15.872-35.84 35.328-35.84h312.832c19.456 0 35.328 15.872 35.328 35.84 0 19.456-15.36 35.84-34.816 35.84z m546.304 0h-312.832c-19.456 0-35.328-16.384-35.328-35.84s15.872-35.84 35.328-35.84h312.832c19.456 0 35.328 15.872 35.328 35.84 0 19.456-15.872 35.84-35.328 35.84z" fill="#FFFFFF" p-id="4504"></path><path d="M512.512 641.536c-77.824 0-141.312-64-141.312-143.36s63.488-143.36 141.312-143.36 141.312 64 141.312 143.36c0 78.848-63.488 143.36-141.312 143.36z m0-215.04c-38.912 0-70.656 32.256-70.656 71.68s31.744 71.68 70.656 71.68c38.912 0 70.656-32.256 70.656-71.68s-31.744-71.68-70.656-71.68z" fill="#FFFFFF" p-id="4505"></path></svg>

+ 2 - 0
src/assets/icons/svg/手机柜.svg

@@ -0,0 +1,2 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1650700660413" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="7076" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css">@font-face { font-family: feedback-iconfont; src: url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff2?t=1630033759944") format("woff2"), url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff?t=1630033759944") format("woff"), url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.ttf?t=1630033759944") format("truetype"); }
+</style></defs><path d="M64 128v768c0 35.328 28.672 64 64 64h768c35.328 0 64-28.672 64-64V128c0-35.328-28.672-64-64-64H128c-35.328 0-64 28.672-64 64zM896 896H128V128h768v768z" fill="#FFFFFF" p-id="7077"></path><path d="M72.192 576h881.664V640H72.192v-64z m247.808 160.256h384v64h-384v-64z" fill="#FFFFFF" p-id="7078"></path></svg>

+ 2 - 0
src/assets/icons/svg/政治教育.svg

@@ -0,0 +1,2 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1650700580591" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="6293" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css">@font-face { font-family: feedback-iconfont; src: url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff2?t=1630033759944") format("woff2"), url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff?t=1630033759944") format("woff"), url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.ttf?t=1630033759944") format("truetype"); }
+</style></defs><path d="M862.208 350.208c37.376-7.68 65.024-22.016 82.944-34.816 25.088-17.92 38.4-35.84 43.008-43.008l0.512-1.024c4.608-7.168 5.632-15.872 3.584-24.064-2.048-8.192-7.168-15.36-14.848-19.968-14.848-9.216-34.816-4.096-44.032 10.752-2.048 3.072-35.84 53.248-125.952 53.248-43.52 0-77.824-25.088-117.248-54.272-40.96-30.208-86.528-63.488-148.48-71.68V100.352c0-17.92-14.336-32.256-32.256-32.256s-32.256 14.336-32.256 32.256v65.024c-59.392 9.728-103.424 41.984-143.36 71.68-39.424 29.184-73.728 54.272-117.248 54.272-49.152 0-81.408-15.36-99.84-28.16-16.384-11.264-24.576-23.04-26.112-25.6-4.096-7.168-11.264-11.776-18.944-13.824-8.192-2.048-17.408-1.024-24.576 3.072-7.68 4.096-12.8 11.264-14.848 19.456s-1.024 17.408 3.584 24.576c3.584 5.632 16.384 24.576 43.52 44.032 17.92 12.8 45.568 27.648 83.456 34.816L34.304 673.792c-7.168 17.92 0 38.912 16.896 48.64 25.6 14.848 91.648 48.64 155.648 48.64 64.512 0 126.976-34.304 150.528-49.152 16.384-10.24 22.528-30.208 15.872-47.616L246.272 352.768c49.664-8.192 88.576-36.864 125.952-64.512 33.792-24.576 66.048-48.64 105.984-57.344v662.016H183.296c-17.92 0-32.256 14.336-32.256 32.256s14.336 32.256 32.256 32.256h659.968c17.92 0 32.256-14.336 32.256-32.256s-14.336-32.256-32.256-32.256h-301.056V229.888c41.984 8.192 75.264 32.768 110.592 58.368 37.376 27.648 76.288 55.808 125.952 64l-127.488 321.024c-7.168 17.92 0 38.912 16.896 48.64 25.6 14.848 91.648 48.64 155.648 48.64 64.512 0 126.976-34.304 150.528-49.152 16.384-10.24 22.528-30.208 15.872-47.616l-128-323.584z m71.68-112.64s0 0.512 0 0c-0.512 0.512-0.512 0.512 0 0zM206.336 706.56c-32.768 0-72.192-13.824-103.936-29.696l101.376-255.488 101.376 256.512c-29.696 14.848-66.56 28.672-98.816 28.672z m617.472 0c-32.768 0-72.192-13.824-103.936-29.696l101.376-255.488 101.376 256.512c-29.696 14.848-67.072 28.672-98.816 28.672z" fill="#FFFFFF" p-id="6294"></path></svg>

Файловите разлики са ограничени, защото са твърде много
+ 1 - 0
src/assets/icons/svg/政治谈心.svg


+ 2 - 0
src/assets/icons/svg/教案库.svg

@@ -0,0 +1,2 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1650700644305" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="6553" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css">@font-face { font-family: feedback-iconfont; src: url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff2?t=1630033759944") format("woff2"), url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff?t=1630033759944") format("woff"), url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.ttf?t=1630033759944") format("truetype"); }
+</style></defs><path d="M263.68 79.36H139.264C104.96 79.36 76.8 107.52 76.8 141.824v757.248c0 34.304 28.16 62.464 62.464 62.464h124.416c34.304 0 62.464-28.16 62.464-62.464v-757.76c0-34.304-28.16-61.952-62.464-61.952z m-5.632 67.584v101.888H144.896V146.944h113.152zM144.896 893.44V316.928H258.048v577.024H144.896v-0.512z m817.664-18.432L844.288 126.464c-5.632-33.792-37.376-57.344-71.168-51.712l-122.88 19.456c-16.384 2.56-30.72 11.776-40.448 25.088-2.048 2.56-3.584 5.12-5.12 8.192-6.656-28.16-31.744-48.128-60.416-48.128H419.84c-34.304 0-62.464 28.16-62.464 62.464v757.248c0 34.304 28.16 62.464 62.464 62.464h124.416c34.304 0 62.464-28.16 62.464-62.464V216.064l110.592 697.856c4.608 30.208 30.72 52.224 61.44 52.736 3.072 0 6.656-0.512 9.728-0.512l122.88-19.456c33.28-6.144 56.832-37.888 51.2-71.68zM538.624 146.944v101.888H425.472V146.944h113.152zM425.472 893.44V316.928h113.152v577.024H425.472v-0.512z m352.256-750.592l15.872 100.864h-1.024L681.984 261.12l-15.872-100.352 111.616-17.92z m5.12 754.688L692.736 328.192l110.592-17.408c0.512 0 0.512 0 1.024-0.512l90.624 569.856-112.128 17.408z" fill="#FFFFFF" p-id="6554"></path></svg>

+ 2 - 0
src/assets/icons/svg/教案库设置.svg

@@ -0,0 +1,2 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1650703439379" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4110" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css">@font-face { font-family: feedback-iconfont; src: url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff2?t=1630033759944") format("woff2"), url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff?t=1630033759944") format("woff"), url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.ttf?t=1630033759944") format("truetype"); }
+</style></defs><path d="M838.656 256H274.432c-61.44 0-111.616-52.224-111.616-116.224S212.992 23.04 274.432 23.04h470.016c12.8 0 22.528 10.752 22.528 23.552s-10.24 23.552-22.528 23.552H274.432c-36.352 0-66.56 31.232-66.56 69.12 0 38.4 29.696 69.12 66.56 69.12h563.712c12.288 0 22.528 10.752 22.528 23.552s-9.728 24.064-22.016 24.064z" fill="#FFFFFF" p-id="4111"></path><path d="M185.344 905.216c-6.144 0-11.776-2.56-15.872-6.656-4.096-4.096-6.656-9.728-6.656-15.872V156.16c0-8.192 4.096-15.36 11.264-19.456 7.168-4.096 15.872-4.096 22.528 0 7.168 4.096 11.264 11.264 11.264 19.456v726.528c0 6.144-2.56 11.776-6.656 15.872-4.096 4.608-9.728 6.656-15.872 6.656z m653.312 95.744c-12.288 0-22.528-9.728-22.528-22.016V243.712c0-12.288 10.24-22.528 22.528-22.528s22.528 9.728 22.528 22.528v734.72c0 12.288-10.24 22.528-22.528 22.528zM744.448 242.688c-12.288 0-22.528-9.728-22.528-22.016V45.568c0-12.288 10.24-22.016 22.528-22.016 12.8 0 22.528 9.728 22.528 22.016v175.104c0 12.288-10.24 22.016-22.528 22.016zM274.432 896c-6.144 0-11.776-2.56-15.872-6.656-4.096-4.096-6.656-9.728-6.656-15.872V354.816c0-12.288 10.24-22.016 22.528-22.016 12.8 0 22.528 9.728 22.528 22.016v518.656c0 6.144-2.56 11.776-6.656 15.872-4.096 4.096-9.728 6.656-15.872 6.656z" fill="#FFFFFF" p-id="4112"></path><path d="M274.432 1000.96c-61.44 0-111.616-49.664-111.616-111.104 0-12.288 10.24-22.528 22.528-22.528 12.8 0 22.528 10.24 22.528 22.528 0 36.352 29.696 66.048 66.56 66.048h563.712c12.288 0 22.528 10.24 22.528 22.528 0 12.288-10.24 22.528-22.528 22.528H274.432z m353.792-307.2c-12.288 0-22.528-10.24-22.528-22.528V326.144c0-12.288 10.24-22.528 22.528-22.528h114.688c12.288 0 22.528 10.24 22.528 22.528v345.6c0 12.288-10.24 22.528-22.528 22.528h-114.688z m23.04-45.056h69.12V348.672h-69.12v300.032z" fill="#FFFFFF" p-id="4113"></path></svg>

+ 2 - 0
src/assets/icons/svg/教育准备会.svg

@@ -0,0 +1,2 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1650703459438" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4372" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css">@font-face { font-family: feedback-iconfont; src: url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff2?t=1630033759944") format("woff2"), url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff?t=1630033759944") format("woff"), url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.ttf?t=1630033759944") format("truetype"); }
+</style></defs><path d="M69.12 139.776c0-20.48 16.384-36.864 36.864-36.864h809.472c20.48 0 36.864 16.384 36.864 36.864s-16.384 36.864-36.864 36.864h-18.432v533.504c0 20.48-16.384 36.864-36.864 36.864h-260.608l121.344 121.344c14.336 14.848 13.824 37.888-1.024 52.224-14.336 13.824-36.864 13.824-51.2 0l-158.208-158.208-158.208 158.208c-14.848 14.336-37.888 13.824-52.224-1.024-13.824-14.336-13.824-36.864 0-51.2l121.344-121.344H161.28c-20.48 0-36.864-16.384-36.864-36.864V176.128h-18.432c-20.48 0-36.864-16.384-36.864-36.352z m441.344 533.504h312.832v-496.64H198.144v496.64h312.32zM345.088 305.152c-20.48 0-36.864 16.384-36.864 36.864s16.384 36.864 36.864 36.864h331.264c20.48 0 36.864-16.384 36.864-36.864s-16.384-36.864-36.864-36.864H345.088z m-36.864 220.672c0-20.48 16.384-36.864 36.864-36.864h257.536c20.48 0 36.864 16.384 36.864 36.864s-16.384 36.864-36.864 36.864H345.088c-20.48 0-36.864-16.384-36.864-36.864z" fill="#FFFFFF" p-id="4373"></path></svg>

+ 2 - 0
src/assets/icons/svg/教育计划.svg

@@ -0,0 +1,2 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1650700653045" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="6815" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css">@font-face { font-family: feedback-iconfont; src: url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff2?t=1630033759944") format("woff2"), url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff?t=1630033759944") format("woff"), url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.ttf?t=1630033759944") format("truetype"); }
+</style></defs><path d="M960 427.52c20.992-11.776 33.28-30.72 33.28-51.712s-12.288-39.936-33.28-51.712L568.32 104.448c-28.672-16.384-74.24-15.872-102.912 0L74.24 324.096c-20.992 11.776-33.28 30.72-33.28 51.712s12.288 39.936 33.28 51.712l109.568 61.44c0 1.024-0.512 2.048-0.512 2.56v291.84c0 2.048 0 4.096 0.512 6.144 7.168 98.816 171.52 150.528 333.312 150.528 163.84 0 329.728-52.736 333.824-154.112V491.008c0-1.024 0-2.048-0.512-2.56l109.568-60.928z m-456.704-256c1.536-1.024 6.656-2.56 13.824-2.56 6.144 0 11.264 1.536 13.824 2.56l364.544 204.288-364.544 204.8c-1.536 1.024-6.656 2.56-13.824 2.56-6.144 0-11.264-1.536-13.824-2.56l-364.544-204.8 364.544-204.288z m270.848 610.304v1.536c-0.512 28.16-98.304 80.384-257.024 80.384S260.608 812.032 260.096 783.36c0-1.536 0-2.56-0.512-4.096v-247.296L465.92 647.68c14.336 8.192 32.768 12.288 51.2 12.288 18.944 0 36.864-4.608 51.2-12.288l205.824-115.2v249.344z" fill="#FFFFFF" p-id="6816"></path><path d="M949.248 459.264c-20.992 0-38.4 17.408-38.4 38.4v304.64c0 20.992 17.408 38.4 38.4 38.4s38.4-17.408 38.4-38.4V497.664c0-20.992-16.896-38.4-38.4-38.4z" fill="#FFFFFF" p-id="6817"></path></svg>

+ 2 - 0
src/assets/icons/svg/智能手机柜.svg

@@ -0,0 +1,2 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1650700656809" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="6946" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css">@font-face { font-family: feedback-iconfont; src: url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff2?t=1630033759944") format("woff2"), url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff?t=1630033759944") format("woff"), url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.ttf?t=1630033759944") format("truetype"); }
+</style></defs><path d="M891.392 51.2c40.96 0 75.264 30.72 80.896 72.192l0.512 5.12v710.656c0 43.52-33.792 79.872-76.8 82.432H784.384l-0.512 3.584c-5.12 24.064-24.576 43.008-49.664 47.104l-4.608 0.512h-51.2c-26.624 0-50.176-17.408-57.344-43.008l-1.024-4.608-0.512-3.584H405.504l-0.512 3.584c-5.12 24.064-24.576 43.008-49.664 47.104l-4.608 0.512h-51.2c-26.624 0-50.176-17.408-57.344-43.008l-1.024-4.608-0.512-3.584H132.608c-41.472 0-76.288-31.232-80.896-72.704l-0.512-4.608V133.632c0-43.52 33.792-79.872 76.8-82.432h763.392zM478.208 117.248H132.608c-7.168 0-13.312 5.632-14.336 13.312v708.096c0 8.192 5.632 14.848 12.288 15.872l2.56 0.512h173.056v51.2h33.28v-51.2h138.752V117.248z m413.184 0h-345.6V855.04h138.752v51.2h33.28v-51.2H890.88c7.168 0 13.312-5.632 14.336-13.312V132.096c-0.512-7.168-5.632-12.8-12.288-14.336l-1.536-0.512zM390.656 409.6c14.336 0 25.6 11.264 25.6 25.6v153.6c0 14.336-11.264 25.6-25.6 25.6s-25.6-11.264-25.6-25.6V435.2c0-14.336 11.264-25.6 25.6-25.6z m249.344 0c14.336 0 25.6 11.264 25.6 25.6v153.6c0 14.336-11.264 25.6-25.6 25.6s-25.6-11.264-25.6-25.6V435.2c0-14.336 11.264-25.6 25.6-25.6z" fill="#FFFFFF" p-id="6947"></path></svg>

+ 2 - 0
src/assets/icons/svg/涉密物品外借.svg

@@ -0,0 +1,2 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1650704125962" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4306" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css">@font-face { font-family: feedback-iconfont; src: url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff2?t=1630033759944") format("woff2"), url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff?t=1630033759944") format("woff"), url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.ttf?t=1630033759944") format("truetype"); }
+</style></defs><path d="M832.512 192.512c-147.456 0-285.184-122.368-285.184-122.368-13.312-9.728-29.696-16.384-42.496-16.384-16.384 0-32.768 6.656-42.496 16.384-3.072 3.072-137.728 122.368-285.184 122.368-36.352 0-65.536 29.696-65.536 66.048v201.216c0 181.76 108.032 333.312 357.376 508.416 9.728 6.656 23.04 13.312 35.84 13.312 13.312 0 26.112-3.072 35.84-13.312 249.344-175.104 357.376-326.656 357.376-508.416V258.56c3.584-36.352-26.112-66.048-65.536-66.048z m16.384 264.704c0 140.288-68.608 280.576-344.064 472.064-274.944-191.488-344.064-331.776-344.064-472.064V248.832c185.856 0 344.064-143.872 344.064-143.872s161.792 143.872 344.064 143.872v208.384z" fill="#FFFFFF" p-id="4307"></path><path d="M644.096 702.464H366.08c-15.872 0-28.672-10.24-28.672-28.672V472.064c0-15.872 13.312-28.672 28.672-28.672h277.504c15.872 0 28.672 13.312 28.672 28.672v201.728c3.072 18.432-10.24 28.672-28.16 28.672zM380.928 480.256c-2.56 0-2.56 2.56 0 0l-2.56 182.784c0 2.56 0 2.56 2.56 2.56h248.32c2.56 0 2.56 0 2.56-2.56V482.816c0-2.56 0-2.56-2.56-2.56H380.928z" fill="#FFFFFF" p-id="4308"></path><path d="M539.136 540.16c0-18.432-18.432-34.304-34.304-34.304-18.432 0-31.232 18.432-31.232 34.304 0 13.312 7.68 26.112 20.992 28.672v47.104c0 5.12 2.56 7.68 7.68 7.68h10.24c5.12 0 7.68-2.56 7.68-7.68v-47.104c10.752-2.56 18.944-15.36 18.944-28.672z m75.776-86.528H578.56V414.72c0-44.544-26.112-68.096-68.096-68.096-44.544 0-68.096 26.112-68.096 68.096v39.424h-36.864V414.72c0-57.856 47.104-104.96 104.96-104.96s104.96 47.104 104.96 104.96c-0.512 0-0.512 38.912-0.512 38.912z" fill="#FFFFFF" p-id="4309"></path></svg>

BIN
src/assets/images/智能手机柜.png


BIN
src/assets/images/虚线1.png


+ 5 - 1
src/assets/styles/global.css

@@ -898,7 +898,11 @@ body #app .sidebar-container .theme-dark .nest-menu .el-submenu>.el-submenu__tit
 
 /* 主页左侧导航栏 */
 .nest-menu li {
-  padding-left: 0px !important;
+  padding-left: 6px !important;
+}
+
+.nest-menu a li span {
+  margin-left: 6px;
 }
 
 /* input下拉背景、字体颜色------input加类名 */

+ 0 - 1
src/main.js

@@ -50,7 +50,6 @@ import VueQuillEditor from 'vue-quill-editor'
 import 'quill/dist/quill.core.css'
 import 'quill/dist/quill.snow.css'
 import 'quill/dist/quill.bubble.css'
-
 import '@/utils/lodJs.js'
 
 // 引入echarts

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

@@ -866,6 +866,7 @@ export default {
         this.title = "修改一周工作安排";
         // 赋值
         this.tomList = response.data.bdglWeekworkRegisterList;
+        this.gongZuoTiem = response.data.bdglWeekworkRegisterList[0].time;
       });
     },
     //查看按钮操作
@@ -893,13 +894,14 @@ export default {
               new Date(this.gongZuoTiem) <= new Date(this.form.endTime)
             ) {
               this.form.bdglWeekworkRegisterList = this.tomList;
-
               updateBdglweekwork(this.form).then((response) => {
                 this.$modal.msgSuccess("修改成功");
                 this.open = false;
                 this.getList();
               });
             } else {
+              // console.log(this.gongZuoTiem, this.form.startTime);
+              // console.log(this.gongZuoTiem, this.form.endTime);
               this.$modal.msgWarning("请选择开始时间与结束时间区级内的日期");
             }
           } else {

+ 283 - 202
src/views/phone/cabinet/index.vue

@@ -1,98 +1,10 @@
 <template>
   <div class="app-container">
-    <!-- <el-table
-      v-loading="loading"
-      :data="cabinetList"
-      @selection-change="handleSelectionChange"
-    >
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="主键" align="center" prop="id" />
-      <el-table-column label="手机柜编号" align="center" prop="number" />
-      <el-table-column label="手机柜位置" align="center" prop="address" />
-      <el-table-column label="格子数量" align="center" prop="gridNumber" />
-      <el-table-column label="存放数量" align="center" prop="storageQuantity" />
-      <el-table-column
-        label="异常数量"
-        align="center"
-        prop="exceptionsNumber"
-      />
-      <el-table-column label="所属单位id" align="center" prop="unitId" />
-      <el-table-column label="所属单位名称" align="center" prop="unitName" />
-      <el-table-column
-        label="操作"
-        align="center"
-        class-name="small-padding fixed-width"
-      >
-        <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['phone:cabinet:edit']"
-            >修改</el-button
-          >
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['phone:cabinet: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"
-    />
-
-    添加或修改手机柜对话框
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="手机柜编号" prop="number">
-          <el-input v-model="form.number" placeholder="请输入手机柜编号" />
-        </el-form-item>
-        <el-form-item label="手机柜位置" prop="address">
-          <el-input v-model="form.address" placeholder="请输入手机柜位置" />
-        </el-form-item>
-        <el-form-item label="格子数量" prop="gridNumber">
-          <el-input v-model="form.gridNumber" placeholder="请输入格子数量" />
-        </el-form-item>
-        <el-form-item label="存放数量" prop="storageQuantity">
-          <el-input
-            v-model="form.storageQuantity"
-            placeholder="请输入存放数量"
-          />
-        </el-form-item>
-        <el-form-item label="异常数量" prop="exceptionsNumber">
-          <el-input
-            v-model="form.exceptionsNumber"
-            placeholder="请输入异常数量"
-          />
-        </el-form-item>
-        <el-form-item label="所属单位id" prop="unitId">
-          <el-input v-model="form.unitId" placeholder="请输入所属单位id" />
-        </el-form-item>
-        <el-form-item label="所属单位名称" prop="unitName">
-          <el-input v-model="form.unitName" placeholder="请输入所属单位名称" />
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
-    </el-dialog> -->
     <div class="box" v-if="phone">
-      <ul class="oneUl" v-for="(item, i) in cabinetList" :key="i" :span="2">
-        <li>
+      <ul>
+        <li class="oneUl" v-for="(item, i) in cabinetList" :key="i">
           <div class="title">{{ item.unitName }}</div>
-          <table class="table" @click="opens">
+          <table class="table" @click="opens(item.id)">
             <tr>
               <td style="text-align: left; width: 86px">柜子编号</td>
               <td style="text-align: right; width: 145px">{{ item.number }}</td>
@@ -105,19 +17,19 @@
             </tr>
             <tr>
               <td style="text-align: left; width: 86px">格子数量</td>
-              <td style="text-align: right; width: 145px">
+              <td style="text-align: right; width: 145px; color: #00f6ff">
                 {{ item.gridNumber }}
               </td>
             </tr>
             <tr>
               <td style="text-align: left; width: 86px">已存放</td>
-              <td style="text-align: right; width: 145px">
+              <td style="text-align: right; width: 145px; color: #13ce66">
                 {{ item.storageQuantity }}
               </td>
             </tr>
             <tr>
               <td style="text-align: left; width: 86px">异常格子</td>
-              <td style="text-align: right; width: 145px">
+              <td style="text-align: right; width: 145px; color: #ff4949">
                 {{ item.exceptionsNumber }}
               </td>
             </tr>
@@ -125,25 +37,8 @@
         </li>
       </ul>
     </div>
+
     <div class="box1" v-if="phone2">
-      <el-row :gutter="10" class="mb9">
-        <el-col :span="1.5" class="isSubmit">
-          <i
-            class="el-icon-arrow-left"
-            style="color: #fff; cursor: pointer"
-            @click="dianJi"
-            >返回</i
-          >
-        </el-col>
-      </el-row>
-      <hr
-        style="
-          width: 102%;
-          margin-left: -15px;
-          border: 1px solid #718a9d;
-          margin-bottom: 14px;
-        "
-      />
       <el-form
         :model="queryParams"
         ref="queryForm"
@@ -151,6 +46,25 @@
         v-show="showSearch"
         label-width="68px"
       >
+        <el-form-item prop="gridNumber">
+          <div
+            style="
+              width: 87px;
+              height: 36px;
+              text-align: center;
+              border: 1px solid #d2d6de;
+              border-radius: 4px;
+              margin-left: 31px;
+            "
+          >
+            <i
+              class="el-icon-arrow-left"
+              style="color: #fff; cursor: pointer"
+              @click="dianJi"
+              >返回</i
+            >
+          </div>
+        </el-form-item>
         <el-form-item prop="gridNumber">
           <el-input
             v-model="queryParams.gridNumber"
@@ -161,68 +75,106 @@
           />
         </el-form-item>
         <el-form-item>
-          <el-button size="btr" @click="resetQuery">重置</el-button>
+          <el-button size="btp" @click="resetQuery">重置</el-button>
         </el-form-item>
         <div class="shuJu">
-          <span class="box44 public"> 已存放</span>
-          <span class="box5 public"> 异常</span>
-          <span class="box6"> 待存放</span>
+          <span class="box44 public"> 已存放 :{{ statistics.cunfang }}个</span>
+          <span class="box5 public"> 异常 :{{ statistics.yichang }}个</span>
+          <span class="box6"> 待存放 :{{ statistics.weicunfang }}个</span>
         </div>
       </el-form>
-      <ul class="twoUl" v-for="(item, i) in cabinetList" :key="i">
-        <li>
-          <div class="two_div"><span>A1</span></div>
-          <el-button size="mini" @click.native="buttOn(item)">李大钊</el-button>
+      <ul class="twoUl">
+        <li
+          v-for="(item, i) in gridList"
+          :key="i"
+          :class="{
+            greed: item.latticeState == '0',
+            red: item.latticeState == '1',
+            yellow: item.latticeState == '2',
+          }"
+        >
+          <div class="two_div">
+            <span>{{ item.gridNumber }}</span>
+          </div>
+          <el-button size="mini" @click.native="buttOn(item)">{{
+            item.name
+          }}</el-button>
         </li>
       </ul>
     </div>
+
     <!-- 格子记录弹出层 -->
-    <el-dialog :title="title" :visible.sync="open" width="827px" append-to-body>
+    <el-dialog
+      :title="title"
+      :visible.sync="open"
+      width="860px"
+      append-to-body
+      :close-on-click-modal="false"
+    >
       <div class="box2">
         <el-form
           ref="form"
           :model="form"
           :rules="rules"
-          label-width="80px"
           inline
+          label-position="right"
         >
           <div class="jiben">基本信息</div>
-          <el-form-item label="柜子ID:" prop="number">
-            <span>A318</span>
-          </el-form-item>
-          <el-form-item label="存物状态:" prop="address">
-            <span>已存</span>
+          <el-form-item label="柜子ID :" prop="number"> A318 </el-form-item>
+          <el-form-item
+            label="存物状态 :"
+            prop="address"
+            style="margin-left: 84px"
+          >
+            已存
           </el-form-item>
-          <el-form-item label="存取次数:" prop="gridNumber">
-            <span>333</span>
+          <el-form-item
+            label="存取次数 :"
+            prop="gridNumber"
+            style="margin-left: 84px"
+          >
+            333
           </el-form-item>
-          <el-form-item label="正常运行" prop="storageQuantity">
-            <span>362</span>
+          <el-form-item
+            label="正常运行 :"
+            prop="storageQuantity"
+            style="margin-left: 84px"
+          >
+            362
           </el-form-item>
-          <div
-            style="
-              border: 1px dashed #606266;
-              margin-top: -14px;
-              margin-bottom: 14px;
-            "
-          ></div>
-          <el-form-item label="柜子ID:" prop="number">
-            <span>A318</span>
+          <div style="margin-top: -30px; margin-bottom: 7px">
+            <img src="../../../assets/images/虚线1.png" alt="" />
+          </div>
+          <el-form-item label="绑定人员 :" prop="number">
+            <span>张三</span>
           </el-form-item>
-          <el-form-item label="存物状态:" prop="address">
-            <span>已存</span>
+          <el-form-item
+            label="性ㅤㅤ别 :"
+            prop="address"
+            style="margin-left: 76px"
+          >
+            <!-- <el-form-item label=" :" prop="address" style="margin-left: 84px"> -->
+            <span>男</span>
           </el-form-item>
-          <el-form-item label="存取次数:" prop="gridNumber">
-            <span>333</span>
+          <el-form-item
+            label="请假状态 :"
+            prop="storageQuantity"
+            style="margin-left: 98px"
+          >
+            <span>在位</span>
           </el-form-item>
-          <el-form-item label="正常运行" prop="storageQuantity">
-            <span>362</span>
+          <el-form-item
+            label="所在单位 :"
+            prop="gridNumber"
+            style="margin-left: 50px"
+          >
+            <span>发射一营一连</span>
           </el-form-item>
           <div class="jiben">存取记录</div>
           <el-table
             :data="tableData"
             style="width: 100%"
-            :header-cell-style="{ background: '#003C69', color: 'white' }"
+            :header-cell-style="{ background: '#004274', color: 'white' }"
           >
             <el-table-column label="序号" width="50px">
               <template scope="scope">
@@ -238,36 +190,30 @@
             <el-table-column prop="name" label="更新时间"> </el-table-column>
             <el-table-column prop="address" label="存物状态"> </el-table-column>
           </el-table>
-          <!-- <el-form-item label="异常数量" prop="exceptionsNumber">
-          <el-input
-            v-model="form.exceptionsNumber"
-            placeholder="请输入异常数量"
-          />
-        </el-form-item>
-        <el-form-item label="所属单位id" prop="unitId">
-          <el-input v-model="form.unitId" placeholder="请输入所属单位id" />
-        </el-form-item>
-        <el-form-item label="所属单位名称" prop="unitName">
-          <el-input v-model="form.unitName" placeholder="请输入所属单位名称" />
-        </el-form-item> -->
         </el-form>
       </div>
-      <!-- <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div> -->
+      <pagination
+        v-show="total > 0"
+        :total="total"
+        :page.sync="queryParams.pageNum"
+        :limit.sync="queryParams.pageSize"
+        @pagination="getList"
+      />
+      <!-- <div slot="footer" class="dialog-footer"></div> -->
     </el-dialog>
   </div>
 </template>
 
 <script>
 import {
-  listCabinet,
+  listCabinet, //一进来请求的数据
   getCabinet,
   delCabinet,
   addCabinet,
   updateCabinet,
   exportCabinet,
+  listGrid,
+  shouJiGrid,
 } from "@/api/phone/cabinet";
 
 export default {
@@ -290,6 +236,8 @@ export default {
       total: 0,
       // 手机柜表格数据
       cabinetList: [],
+      // 手机柜格子列表
+      gridList: [],
       // 弹出层标题
       title: "",
       // 是否显示弹出层
@@ -297,7 +245,7 @@ export default {
       // 查询参数
       queryParams: {
         pageNum: 1,
-        pageSize: 10,
+        pageSize: 4,
         number: null,
         address: null,
         gridNumber: null,
@@ -318,24 +266,31 @@ export default {
         {
           date: "2016-05-02",
           name: "王小虎",
-          address: "上海市普陀区金沙江路 1518 弄",
+          address: "在位",
         },
         {
           date: "2016-05-04",
           name: "王小虎",
-          address: "上海市普陀区金沙江路 1517 弄",
+          address: "在位",
         },
         {
           date: "2016-05-01",
           name: "王小虎",
-          address: "上海市普陀区金沙江路 1519 弄",
+          address: "在位",
+        },
+        {
+          date: "2016-05-03",
+          name: "王小虎",
+          address: "在位",
         },
         {
           date: "2016-05-03",
           name: "王小虎",
-          address: "上海市普陀区金沙江路 1516 弄",
+          address: "在位",
         },
       ],
+      // 统计个数
+      statistics: {},
     };
   },
   created() {
@@ -344,7 +299,8 @@ export default {
   methods: {
     // 点击名字触发
     buttOn(row) {
-      console.log(row);
+      // console.log(row);
+      this.queryParams.phoneCabinetId = row.id;
       this.open = true;
       this.title = "柜子记录";
     },
@@ -355,19 +311,31 @@ export default {
       this.queryParams.gridNumber = null;
     },
     // 点击手机柜触发
-    opens() {
+    opens(id) {
+      console.log(id);
+      // 赋值到查询参数中
+      this.queryParams.phoneCabinetId = id;
       this.phone = false;
       this.phone2 = true;
+      listGrid(this.queryParams.phoneCabinetId).then((res) => {
+        this.gridList = res.rows;
+      });
+      shouJiGrid().then((res) => {
+        this.statistics = res.data;
+      });
     },
     /** 查询手机柜列表 */
     getList() {
       this.loading = true;
       listCabinet().then((response) => {
-        console.log(response);
+        console.log(response); //请求回来的数据
         this.cabinetList = response.rows;
         this.total = response.total;
         this.loading = false;
       });
+      // aaa().then((res) => {
+      //   console.log(res);
+      // });
     },
     // 取消按钮
     cancel() {
@@ -470,22 +438,34 @@ export default {
         .catch(() => {});
     },
   },
+  watch: {},
 };
 </script>
 <style scoped>
+* {
+  padding: 0;
+}
 ul {
   list-style-type: none;
 }
-.oneUl {
-  display: inline-block;
-  padding-left: 10px;
-  /* padding-left: calc((1793px - 1530px) / 5); */
+.box ul {
+  /* display: flex;
+  flex-flow: wrap; */
+  display: flex;
+  flex-flow: wrap;
+  margin-left: 2%;
+  padding-left: -1%;
+  padding-top: 28px;
 }
-.oneUl li {
+.oneUl {
+  flex: 1;
+  /* display: inline-block; */
   background: url("../../../assets/images/柜子2.png") no-repeat;
-  width: 306px;
+  /* width: 306px; */
   height: 285px;
   padding: 22px;
+  min-width: 308px;
+  margin-bottom: 40px;
 }
 .title {
   color: #fff;
@@ -506,31 +486,46 @@ ul {
 }
 ::v-deep .el-input__inner {
   color: #fff;
-  width: 200px;
+  /* width: 200px; */
   height: 36px;
 }
-.twoUl li {
+.red {
+  background: url("../../../assets/images/抽屉-红色1.png") no-repeat;
+}
+.greed {
   background: url("../../../assets/images/抽屉-绿色1.png") no-repeat;
-  width: 173px;
-  height: 114px;
-  padding: 22px;
 }
-.twoUl li {
-  background: url("../../../assets/images/抽屉-红色1.png") no-repeat;
-  width: 173px;
-  height: 114px;
-  padding: 22px;
+.yellow {
+  background: url("../../../assets/images/抽屉-黄色1.png") no-repeat;
+}
+
+.box1 {
+  padding-top: 17px;
+  padding-left: 24px;
 }
 .twoUl li {
-  background: url("../../../assets/images/抽屉-黄色1.png") no-repeat;
-  width: 173px;
   height: 114px;
-  padding: 22px;
+  padding: 20px;
+  margin-right: 22px;
+  margin-bottom: 43px;
+  min-width: 175px;
+
+  /* margin-bottom: 43px;
+  flex: 1;
+  max-width: 173px;
+  margin-right: 2%; */
 }
 .twoUl {
-  display: inline-block;
-  padding-left: 10px;
-  margin-left: 12px;
+  /* display: inline-block;
+  padding-left: 0px;
+  margin-left: 10px;
+  margin-top: 0px;
+  margin-bottom: 38px;
+  margin-right: 14px; */
+  padding-left: 12px;
+  display: flex;
+  flex-flow: wrap;
+  margin-top: 0px;
 }
 .two_div {
   text-align: center;
@@ -539,15 +534,17 @@ ul {
   color: #fff;
 }
 ::v-deep .el-button--mini {
-  margin-left: 30px !important;
+  margin-left: 25px !important;
   margin-top: 6px !important;
   background: #1263aa;
   border-color: #1263aa;
   color: #ffffff;
+  width: 82px;
+  height: 30px;
 }
 .shuJu {
   height: 16px;
-  margin-top: 13px;
+  margin-top: 26px;
   margin-right: 90px;
   float: right;
   color: #fff;
@@ -581,10 +578,6 @@ ul {
   background-color: #ffba00;
   margin-left: 26px;
 }
-/* 卡片样式 */
-/* .app-container {
-  height: calc(100vh - 108px) !important;
-} */
 ::v-deep .el-dialog {
   background-color: #004d86;
   margin: auto;
@@ -599,12 +592,100 @@ ul {
 }
 .box2 form .el-form-item {
   color: #fff;
-  margin-left: -21px;
-  margin-right: 110px;
+  margin-right: 20px;
 }
 
 /*  鼠标经过颜色 */
 ::v-deep .el-table__body tr:hover > td {
   background-color: transparent !important;
 }
+::v-deep .box1 form {
+  margin-left: -14px;
+}
+::v-deep .box1 form .el-form-item {
+  margin-top: 17px;
+}
+::v-deep .el-form-item {
+  margin-bottom: 29px;
+}
+.jiben {
+  width: 100%;
+  height: 32px;
+  background-image: url(/static/img/小标题底.b7c6f45a.png);
+  margin-bottom: 18px;
+  color: #fff;
+  padding-left: 16px;
+  line-height: 32px;
+  background-size: contain;
+}
+::v-deep .el-table tr:nth-child(odd) {
+  background: #004d86;
+}
+::v-deep .el-dialog__body {
+  padding: 30px 38px;
+}
+::v-deep .el-form-item__label {
+  padding: 0 0 0 0;
+}
+/* 重置按钮 */
+.el-button--btp.is-active,
+.el-button--btp:active {
+  background: #3da1f8;
+  border-color: #3da1f8;
+  color: #ffffff;
+}
+
+.el-button--btp:focus,
+.el-button--btp:hover {
+  background: #3da1f8;
+  border-color: #3da1f8;
+  color: #ffffff;
+}
+
+.el-button--btp {
+  color: #ffffff;
+  width: 76px;
+  height: 36px;
+  background-color: #1d96ff;
+  border-radius: 4px;
+  font-size: 14px;
+  text-align: center;
+  margin-top: 1px;
+}
+::v-deep .el-dialog {
+  border-radius: 8px;
+}
+::v-deep .has-gutter tr {
+  height: 60px;
+}
+/* 分页样式 */
+::v-deep .pagination-container {
+  background: #004d85 !important;
+}
+::v-deep .el-pagination__total {
+  margin-top: 2px !important;
+}
+::v-deep .el-pagination .el-select .el-input .el-input__inner {
+  background-color: #196299 !important;
+  height: 30px;
+}
+::v-deep .el-pagination.is-background .btn-prev,
+.el-pagination.is-background .btn-next {
+  background-color: #265070 !important;
+}
+::v-deep .el-pagination.is-background .el-pager li {
+  background-color: #196299 !important;
+}
+::v-deep .el-pagination__editor.el-input .el-input__inner {
+  background-color: #196299 !important;
+}
+::v-deep .el-pagination.is-background .el-pager li:not(.disabled).active {
+  background-color: #1890ff !important;
+}
+::v-deep .el-pagination.is-background .btn-next {
+  background: #265070 !important;
+}
+::v-deep .el-pagination__sizes {
+  display: none !important;
+}
 </style>

+ 21 - 13
src/views/pt.vue

@@ -151,7 +151,11 @@
             </li>
             <li>
               <div class="demo-box">
-                <div class="demo active"  v-on:click="anfangfun" data-url="/diary?ref=addtabs">
+                <div
+                  class="demo active"
+                  v-on:click="anfangfun"
+                  data-url="/diary?ref=addtabs"
+                >
                   <img src="../images/af.png" alt />
                 </div>
               </div>
@@ -183,36 +187,40 @@
                 <a href="#" class="a">门禁管理</a>
               </div>
             </li>
-            <img src="../assets/images/椭圆 513 (2).png" class="li-img" alt />
-          </ul>
-          <hr />
-          <ul class="ul">
             <li>
               <div class="demo-box">
                 <div
                   class="demo active"
-                  v-on:click="sixiangfun"
+                  v-on:click="zhinengfun"
                   data-url="/diary?ref=addtabs"
                 >
-                  <img src="../images/sx.png" alt />
+                  <img
+                    src="../assets/images/智能手机柜.png"
+                    alt
+                    class="phone"
+                  />
                 </div>
               </div>
               <div class="demo-a">
-                <a href="#" class="a">思想政治教育</a>
+                <a href="#" class="a">智能手机柜</a>
               </div>
             </li>
+            <img src="../assets/images/椭圆 513 (2).png" class="li-img" alt />
+          </ul>
+          <hr />
+          <ul class="ul">
             <li>
               <div class="demo-box">
                 <div
                   class="demo active"
-                  v-on:click="zhinengfun"
+                  v-on:click="sixiangfun"
                   data-url="/diary?ref=addtabs"
                 >
-                  <img src="../assets/images/phone1.png" alt class="phone" />
+                  <img src="../images/sx.png" alt />
                 </div>
               </div>
               <div class="demo-a">
-                <a href="#" class="a">智能手机柜</a>
+                <a href="#" class="a">思想政治教育</a>
               </div>
             </li>
             <li>
@@ -797,7 +805,7 @@ export default {
         .catch(() => {});
       Cookies.set("shuaxin", "false");
     },
-    anfangfun(){
+    anfangfun() {
       this.$router
         .push({ path: "/index", query: { name: "/monitoring" } })
         .catch(() => {});
@@ -1110,7 +1118,7 @@ li {
 .ul li {
   /* margin: 0 48px; */
   cursor: pointer;
-  width: 16.5%;
+  width: 14.1%;
   height: 100%;
   display: inline-block;
 }

+ 0 - 5
web-types-npm-loader.xml

@@ -1,5 +0,0 @@
-<application>
-  <component name="WebTypesNpmLoader">
-    <enabled />
-  </component>
-</application>

Някои файлове не бяха показани, защото твърде много файлове са промени