Merge remote-tracking branch 'origin/main'

src/App.vue

@@ -45,44 +45,6 @@ window.onload = function() {
 
 <style lang="scss">
 /*本月日期数字*/
-.el-picker-panel{
-  color: #00F6EC;
-}
-.el-date-table td.available:hover{
-  color: #06131f;
-}
-/*面板上方按钮*/
-.el-picker-panel__icon-btn{
-  color: #00F6EC;
-}
-.el-picker-panel__icon-btn:hover{
-  color: #06131f;
-}
-/*面板上方显示日期*/
-.el-date-picker__header-label{
-  color: #00F6EC;
-}
-.el-date-picker__header-label:hover {
-  color: #06131f;
-}
-/*周一至周日文字及下划线*/
-.el-date-table th{
-  color: #00F6EC;
-  border-bottom: solid 1px #00F6EC;
-}
-/*面板背景色*/
-.el-picker-panel.el-date-picker {
-  background-color: rgba(53, 141, 141, 0.59);
-}
-/*选中日期颜色*/
-.el-date-table td.current:not(.disabled) span{
-  background-color: #00F6EC;
-}
-.popper__arrow{
-  border-bottom-color: #00F6EC !important;
-}
-.popper__arrow::after {
-  border-bottom-color: rgba(53, 141, 141, 0.59) !important;
-}
+
 
 </style>

src/api/screen/service.js

@@ -799,7 +799,7 @@ export function getProjectByAppOrg(appOrg) {
 
 export function getProjectNumZ(appOrg) {
   return request({
-    url: '/large/production/getProjectNumZ/' + appOrg,
+    url: '/large/production/getProjectNumZ',
     method: 'get'
   })
 }

src/views/screen/main.vue

@@ -185,6 +185,46 @@ export default {
   src: url("../../assets/fonts/PingFang.ttf");
 }
 
+.el-picker-panel{
+  color: #00F6EC;
+}
+.el-date-table td.available:hover{
+  color: #06131f;
+}
+/*面板上方按钮*/
+.el-picker-panel__icon-btn{
+  color: #00F6EC;
+}
+.el-picker-panel__icon-btn:hover{
+  color: #06131f;
+}
+/*面板上方显示日期*/
+.el-date-picker__header-label{
+  color: #00F6EC;
+}
+.el-date-picker__header-label:hover {
+  color: #06131f;
+}
+/*周一至周日文字及下划线*/
+.el-date-table th{
+  color: #00F6EC;
+  border-bottom: solid 1px #00F6EC;
+}
+/*面板背景色*/
+.el-picker-panel.el-date-picker {
+  background-color: rgba(53, 141, 141, 0.59);
+}
+/*选中日期颜色*/
+.el-date-table td.current:not(.disabled) span{
+  background-color: #00F6EC;
+}
+.popper__arrow{
+  border-bottom-color: #00F6EC !important;
+}
+.popper__arrow::after {
+  border-bottom-color: rgba(53, 141, 141, 0.59) !important;
+}
+
 .big-screen {
   width: 100%;
   height: 100vh;