Merge remote-tracking branch 'origin/master'

src/router/routes.ts

@@ -305,7 +305,25 @@ export const constantRoutes: Array<RouteRecordRaw> = [
     meta: {
       title: "审批详情"
     }
-  }
+  },
+  {
+    path: "/rollCallDetails",
+    name: "RollCallDetails",
+    component: () => import("@/views/onlineRollCall/rollCallDetails.vue"),
+    meta: {
+      title: "选择抽查单位",
+      noCache: true
+    }
+  },
+  {
+    path: "/rollCallRecord2",
+    name: "rollCallRecord2",
+    component: () => import("@/views/onlineRollCall/rollCallRecord2.vue"),
+    meta: {
+      title: "点名记录",
+      noCache: true
+    }
+  },
 ];
 
 // 领导端动态菜单
@@ -333,24 +351,6 @@ export const leaderRoute: Array<RouteRecordRaw> = [
           noCache: true
         }
       },
-      {
-        path: "rollCallDetails",
-        name: "RollCallDetails",
-        component: () => import("@/views/onlineRollCall/rollCallDetails.vue"),
-        meta: {
-          title: "选择抽查单位",
-          noCache: true
-        }
-      },
-      {
-        path: "rollCallRecord2",
-        name: "rollCallRecord2",
-        component: () => import("@/views/onlineRollCall/rollCallRecord2.vue"),
-        meta: {
-          title: "点名记录",
-          noCache: true
-        }
-      },
       {
         path: "address_book",
         name: "AddressBook",

src/views/onlineRollCall/rollCallDetails.vue

@@ -158,7 +158,7 @@ const getClass = (value) => {
   } else if (value === '已接通') {
     res = 'text-blue'
   }
-  return res;
+  return "text-status " + res;
 };
 const calculateDuration = () => {
   // 将起始时间字符串转换为日期对象
@@ -211,11 +211,11 @@ const handleExport = async() => {
 }
 
 const handleVideo = (url) => {
-  showToast("对接融合通信后发起视频 video:"+url);
+  showToast("唤醒融合通信视频功能");
 }
 
 const handleCall = (url) => {
-  showToast("对接融合通信后发起电话 tel:"+url);
+  showToast("唤醒融合通信电话功能");
 }
 
 onMounted(() => {
@@ -454,6 +454,10 @@ onUnmounted(() => {
           font-size: 14px;
           color: #2c81ff;
         }
+
+        .text-status {
+          margin-top:5px;
+        }
         .text-green {
           font-size: 12px;
           color: #73d68c;

src/views/onlineRollCall/rollCallRecord2.vue

@@ -154,7 +154,8 @@ onMounted(() => {
 <style lang="scss" scoped>
 .container {
   padding: 16px;
-  height: calc(100vh - 55px) !important;
+  // height: calc(100vh - 55px) !important;
+  height: calc(100vh) !important;
 }
 
 .box1 {
@@ -304,6 +305,8 @@ onMounted(() => {
     background-color: #ededed;
     border-radius: 8px;
     margin: 8px;
+    background: url("@/assets/images/onlineRollCall/header1.png") no-repeat;
+    background-size: 100% 100%;
   }
   .box-right {
     .text1 {

src/views/worker/eventManagement/requestDialog.vue

@@ -15,7 +15,7 @@
                     placeholder="请选择领导姓名"
                     :rules="[{ required: true, message: '请选择领导姓名'  }]"
                 />
-                <div style="font-size:14px;color:var(--van-field-label-color);margin-top:10px;padding-left: 15px;">请示信息：</div>
+                <div class="label1">请示信息：</div>
                 <van-field
                     required
                     v-model="form.content"
@@ -110,4 +110,10 @@ const closeDialog = (t) => {
     font-weight: 600;
     line-height: 6.0vmin;
 }
+.label1 {
+    font-size: var(--van-cell-font-size);
+    color:var(--van-field-label-color);
+    margin-top:10px;
+    padding-left: 15px;
+}
 </style>