Merge branch 'lkh_questionIssue_fix' into 'all-v4'

fix: 问题通知bug一期

See merge request skyeye/skyeye_frontend/skyeye-admin!322

src/views/message/question-notifications/components/WorkShopTree.vue

@@ -18,6 +18,7 @@
         :props="defaultProps"
         :render-after-expand="false"
         :filter-node-method="filterNode"
+        :default-checked-keys="defaultSelectedByCode"
         accordion
         @node-click="handleNodeClick"
         @check-change="handleCheckChange"
@@ -26,10 +27,7 @@
     <div class="right" style="margin-left: 16px">
       <div class="head" style="margin-bottom: 22px">
         <span style="font-weight: 400; font-size: 16px; color: rgba(0, 0, 0, 0.88); line-height: 22px"
-          >已选择（{{ selected }}</span
-        >
-        <span style="margin-left: 4px; font-size: 10px; font-weight: 400; color: rgba(0, 0, 0, 0.45); line-height: 22px"
-          >/&nbsp;{{ total }}</span
+          >已选择({{ selected }})</span
         >
       </div>
       <div class="selected">
@@ -97,6 +95,7 @@
   const treeRef = ref<InstanceType<typeof ElTree>>();
   const total = ref<number>(0);
   const selected = ref<number>(0);
+  const defaultSelectedByCode = ref<(string | number)[]>([]);
   const selectedPeople = ref<treeSelected[]>([]);
   const handleTagClose = (code) => {
     const index = selectedPeople.value.findIndex((item) => item.code === code);
@@ -155,6 +154,8 @@
   onMounted(() => {
     getPushRange().then((res) => {
       selectedPeople.value = res;
+      selected.value = selectedPeople.value.length;
+      defaultSelectedByCode.value = selectedPeople.value.map((item) => item.code);
     });
     getCameraData({});
   });

src/views/message/question-notifications/components/contentPanel.vue

@@ -84,7 +84,9 @@
         :min="0"
         size="small"
         style="width: 70px"
-        controls-position="right" />小时未{{ props.title }}再次推送给{{ props.title }}员并抄送给<el-select
+        controls-position="right"
+      />小时未{{ props.title }}再次推送给{{ props.title }}员并抄送给
+      <el-select
         :disabled="!editDetails.openEdit || !editDetails.atLongTimeExpiry"
         v-model="editDetails.copyTo"
         value-key="id"
@@ -97,8 +99,17 @@
         collapse-tags
         collapse-tags-tooltip
       >
-        <el-option v-for="item in editDetails.copyTo" :key="item.id" :label="item.realname" :value="item" /> </el-select
-    ></div>
+        <el-option v-for="item in editDetails.copyTo" :key="item.id" :label="item.realname" :value="item" />
+      </el-select>
+      <el-tooltip
+        class="box-item"
+        effect="dark"
+        content="指定对象通常为领导，请确保领导具有查看违规地点数据的权限，以便进行监督管理！"
+        placement="top"
+      >
+        <div class="remind"></div>
+      </el-tooltip>
+    </div>
     <div class="subtitle">推送文案 </div>
     <el-tooltip
       class="box-item"
@@ -175,6 +186,10 @@
   const selectedUser = ref<SelectedFilterPersonInfo[]>([]);
 
   const openNameTree = () => {
+    //如果非编辑状态或长期的开关处于关闭状态则什么都不干
+    if (!editDetails.value.atLongTimeExpiry || !editDetails.value.openEdit) {
+      return;
+    }
     selectedUser.value = editDetails.value.copyTo!;
     dialogVisible.value = true;
   };
@@ -286,6 +301,14 @@
       text-align: left;
       display: flex;
       flex-direction: row;
+      .remind {
+        height: 11.2px;
+        width: 11.2px;
+        margin-left: 4px;
+        margin-top: 6px;
+        background-image: url('@/assets/icons/info.png');
+        background-size: 100% 100%;
+      }
     }
     .editable {
       color: #303133 !important;