Merge remote-tracking branch 'origin/master'

base-manager-ui/admin/src/pages/basicset/dept/department.vue

@@ -43,7 +43,7 @@
                       type="edit"
                       class="department_edit"
                       title="编辑"
-                      @click="showModal(v)"
+                      @click.stop="showModal(v)"
                     />
                   </a-tooltip>
                   <a-tooltip>
@@ -51,7 +51,7 @@
 
                     <a-icon
                       type="delete"
-                      @click="delDepartment(v.id)"
+                      @click.stop="delDepartment(v.id)"
                       class="delete"
                       department_del
                     />
@@ -122,11 +122,11 @@
             </template>
             <!-- 所属楼栋 -->
             <template slot="building" slot-scope="text">
-              <span>{{ text.building ? text.building : "--" }}</span>
+              <span>{{ text.building ? text.building + "栋" : "--" }}</span>
             </template>
             <!-- 所属楼层 -->
             <template slot="level" slot-scope="text">
-              <span>{{ text.level ? text.level : "--" }}</span>
+              <span>{{ text.level ? text.level + "层" : "--" }}</span>
             </template>
             <!-- 备注 -->
             <template slot="summary" slot-scope="text">

base-manager-ui/admin/src/pages/basicset/surface/calloutskin/CallOutSkin.vue

@@ -73,7 +73,7 @@
       <div class="footer flex jcc aic">
         <div class="footer-item">
           <p :style="{ color: filterItem('5', 0) }">当前窗口</p>
-          <p class="footer-data" :style="{ color: filterItem('6', 0) }">
+          <p class="footer-data" :style="{ color: filterItem('7', 0) }">
             A区16号
           </p>
         </div>
@@ -81,14 +81,14 @@
           class="line"
           :style="{
             backgroundImage: `linear-gradient(to bottom,#ccc,${filterItem(
-              '6',
+              '7',
               0
-            )} 45%,${filterItem('6', 0)} 65%,#ccc 100% )`,
+            )} 45%,${filterItem('7', 0)} 65%,#ccc 100% )`,
           }"
         ></div>
         <div class="footer-item">
           <p :style="{ color: filterItem('5', 0) }">当前办理</p>
-          <p class="footer-data" :style="{ color: filterItem('6', 0) }">
+          <p class="footer-data" :style="{ color: filterItem('7', 0) }">
             A0012
           </p>
         </div>
@@ -96,14 +96,14 @@
           class="line"
           :style="{
             backgroundImage: `linear-gradient(to bottom,#ccc,${filterItem(
-              '6',
+              '7',
               0
-            )} 45%,${filterItem('6', 0)} 65%,#ccc 100% )`,
+            )} 45%,${filterItem('7', 0)} 65%,#ccc 100% )`,
           }"
         ></div>
         <div class="footer-item">
           <p :style="{ color: filterItem('5', 0) }">等待办理</p>
-          <p class="footer-data" :style="{ color: filterItem('6', 0) }">
+          <p class="footer-data" :style="{ color: filterItem('7', 0) }">
             <span>160</span>
             <span>120</span>
           </p>
@@ -112,14 +112,14 @@
           class="line"
           :style="{
             backgroundImage: `linear-gradient(to bottom,#ccc,${filterItem(
-              '6',
+              '7',
               0
-            )} 45%,${filterItem('6', 0)} 65%,#ccc 100% )`,
+            )} 45%,${filterItem('7', 0)} 65%,#ccc 100% )`,
           }"
         ></div>
         <div class="footer-item">
           <p :style="{ color: filterItem('5', 0) }">当天办理</p>
-          <p class="footer-data" :style="{ color: filterItem('6', 0) }">16</p>
+          <p class="footer-data" :style="{ color: filterItem('7', 0) }">16</p>
         </div>
       </div>
     </div>

portal-manager-ui/admin/src/assets/css/common.css

 /* 颜色 */
 .primary {
-    color: #1890FF;
+  color: #1890ff;
 }
 
 .delete {
-    color: #FF4D4F;
+  color: #ff4d4f;
 }
 
 .green {
-    color: #1BBC9B;
+  color: #1bbc9b;
 }
 
 .clofff {
@@ -20,15 +20,15 @@
 }
 
 .bgdel {
-    background-color: #FF4D4F;
+  background-color: #ff4d4f;
 }
 
 .bgpr {
-    background-color: #1890FF;
+  background-color: #1890ff;
 }
 
 .bgg {
-    background-color: #1BBC9B;
+  background-color: #1bbc9b;
 }
 
 /* 版心 */
@@ -42,7 +42,7 @@
 }
 
 .flex1 {
-    flex: 1
+  flex: 1;
 }
 
 .flexc {
@@ -87,7 +87,7 @@
 
 /* margin */
 .m10 {
-    margin: 10px
+  margin: 10px;
 }
 
 .m15 {
@@ -304,13 +304,11 @@
   text-align: right;
 }
 
-
 .color_title {
   margin-left: 15px;
   position: relative;
   margin-bottom: 15px;
   color: #1890ff;
-
 }
 
 .color_title::before {
@@ -324,16 +322,27 @@
 }
 ::-webkit-scrollbar {
   width: 6px;
-    height:6px;
+  height: 6px;
   overflow-y: auto;
 }
 
 ::-webkit-scrollbar-thumb {
   border-radius: 6px;
-    background-color: rgba(144, 147, 153, .5);
+  background-color: rgba(144, 147, 153, 0.5);
 }
 
 ::-webkit-scrollbar-track {
   border-radius: 6px;
   background: #fff;
 }
+.ant-modal-close {
+  color: #188fff !important;
+}
+.ant-modal-close svg {
+  font-size: 26px !important;
+}
+.ant-modal-title {
+  color: #1890ff !important;
+  font-size: 18px;
+  font-weight: bold;
+}

portal-manager-ui/admin/src/views/thePlatformIsSet/components/menuManagement/components/addEdit.vue

@@ -9,6 +9,7 @@
       :confirmLoading="EditModalLoading"
       @cancel="handleClose"
       width="33%"
+      :maskClosable="false"
     >
       <a-form-model
         :label-col="{

portal-manager-ui/admin/src/views/thePlatformIsSet/components/permissionsModel/components/EditPwd.vue

@@ -7,6 +7,7 @@
       centered
       @ok="handleOk"
       @cancel="handleClose"
+      :maskClosable="false"
     >
       <a-form-model
         :model="form"

portal-manager-ui/admin/src/views/thePlatformIsSet/components/permissionsModel/components/EditUser.vue

@@ -6,6 +6,7 @@
       :centered="true"
       :visible="Visible"
       @cancel="Visible = false"
+      :maskClosable="false"
     >
       <a-form-model
         ref="ruleForm"

portal-manager-ui/admin/src/views/thePlatformIsSet/components/permissionsModel/components/addEditRole.vue

@@ -9,6 +9,7 @@
       :confirmLoading="roleEditModalLoading"
       @cancel="roleEditModalVisible = false"
       width="30%"
+      :maskClosable="false"
     >
       <a-form-model
         :label-col="{

portal-manager-ui/admin/src/views/thePlatformIsSet/components/permissionsModel/components/addUser.vue

@@ -6,6 +6,7 @@
       :centered="true"
       :visible="Visible"
       @cancel="Visible = false"
+      :maskClosable="false"
     >
       <a-form-model
         ref="ruleForm"