2
0
刘洋 6 сар өмнө
parent
commit
c01fbe7ccd

+ 27 - 8
src/components/Abnormal.vue

@@ -7,12 +7,13 @@
       enterActiveClass="animate__animated animate__slideInDown"
       leaveActiveClass="animate__animated animate__slideOutUp"
     >
-      <a-alert v-if="show" :message="result" banner />
+      <!-- <a-alert v-if="show" :message="result" banner /> -->
+      <div v-if="show" class="text-box">{{ result }}</div>
     </Transition>
   </div>
 </template>
 <script name="Abnormal" lang="ts" setup>
-import { computed, ref } from "vue";
+import { computed, ref, watch } from "vue";
 import { store } from "@/store/store";
 
 import { UpOutlined } from "@ant-design/icons-vue";
@@ -23,8 +24,16 @@ const result = computed(() => {
     collationLabelList.find(
       (item: any) => item.code == store.currentTask?.collationLabelCode
     )?.name || "";
-  return `试卷整理异常信息:${store.currentTask?.secretNumber || ""} - ${name}`;
+  return `试卷整理异常信息:${
+    store.currentTask?.collationLabelCode || ""
+  } - ${name}`;
 });
+watch(
+  () => store.currentTask,
+  () => {
+    show.value = true;
+  }
+);
 </script>
 <style lang="less" scoped>
 .abnormal {
@@ -32,24 +41,34 @@ const result = computed(() => {
   top: 0;
   left: 0;
   z-index: 1;
-  :deep(.ant-alert-warning) {
+  width: 50%;
+  // :deep(.ant-alert-warning) {
+  //   padding-left: 30px;
+  // }
+  .text-box {
     padding-left: 30px;
+    background: rgba(0, 0, 0, 0.7);
+    color: #fff;
+    line-height: 1.4;
+    height: 30vh;
+    font-size: 20px;
+    overflow: auto;
   }
   .collapse-btn {
     position: absolute;
     left: 5px;
-    top: 8px;
+    top: 4px;
     z-index: 1;
     width: 20px;
     height: 20px;
     border-radius: 50%;
-    background: #fffbe6;
-    color: #faad14;
+    background: #fff;
+    color: var(--app-primary-button-bg-color);
     display: flex;
     justify-content: center;
     align-items: center;
     cursor: pointer;
-    border: 1px solid #faad14;
+    border: 1px solid var(--app-primary-button-bg-color);
     transition: all 0.5s;
     &.rotate {
       transform: rotate(180deg);

+ 15 - 7
src/devLoginParams.ts

@@ -105,18 +105,26 @@
 //   examId: "391",
 //   markerId: "4187",
 // };
-
-/** 225 管理员 */
-
 export const LOGIN_CONFIG = {
-  isAdmin: true,
+  isAdmin: false,
   forceChange: true,
-  loginName: "admin031",
+  loginName: "1-432-3-1",
   password: "123456",
-  examId: "391",
-  markerId: null,
+  examId: "1",
+  markerId: "6",
 };
 
+/** 225 管理员 */
+
+// export const LOGIN_CONFIG = {
+//   isAdmin: true,
+//   forceChange: true,
+//   loginName: "admin031",
+//   password: "123456",
+//   examId: "391",
+//   markerId: null,
+// };
+
 // export const LOGIN_CONFIG = {
 //   isAdmin: true,
 //   forceChange: true,

+ 2 - 1
vite.config.ts

@@ -6,7 +6,8 @@ import { AntDesignVueResolver } from "unplugin-vue-components/resolvers";
 // const SERVER_URL = "http://192.168.10.123:8000";
 // const SERVER_URL = "https://www.markingcloud.com";
 // const SERVER_URL = "http://192.168.11.103:8090";
-const SERVER_URL = "http://192.168.10.225";
+// const SERVER_URL = "http://192.168.10.225";
+const SERVER_URL = "http://192.168.10.210:8000";
 
 const path = require("path");