提交merge1.3

openhis-ui-vue3/src/views/index.vue

@@ -1,4 +1,5 @@
 <template>
+<<<<<<< HEAD
   <div class="dashboard-container">
     <!-- 顶部导航栏 -->
     <header class="header">
@@ -185,10 +186,28 @@
         </div>
       </div>
     </div>
+=======
+  <div class="container">
+    <div class="awaitingBtn">
+      <el-button @click="awaitingMedicineBtn">
+        效期预警
+        <span>{{ total }}</span>
+      </el-button>
+
+      <!-- <el-select v-model="selectValue" @change="handelChange" @keyup.enter="handelEnter">
+      <el-option label="测试1" value="1"/>
+      <el-option label="测试2" value="2 "/>
+    </el-select> -->
+    </div>
+    <!-- <div class="logo">
+      <img src="/src/assets/images/jlau.jpg" />
+    </div> -->
+>>>>>>> v1.3
   </div>
 </template>
 
 <script setup name="Index">
+<<<<<<< HEAD
 import { ref, onMounted, onActivated } from 'vue';
 import { useRouter } from 'vue-router';
 import Chart from 'chart.js/auto';
@@ -319,6 +338,43 @@ onMounted(() => {
     }
   });
 });
+=======
+import { getproductReturnPage } from './medicationmanagement/statisticalManagement/statisticalManagent';
+import { useStore } from '@/store/store';
+const store = useStore();
+
+const router = useRouter();
+const version = ref('3.8.7');
+const total = ref(0);
+const selectValue = ref('');
+function awaitingMedicineBtn() {
+  store.setRemainingDays(180);
+  console.log(store.remainingDays);
+
+  router.push({
+    path: '/medicationmanagement/statisticalManagement/statisticalManagement',
+  });
+}
+function goTarget(url) {
+  window.open(url, '__blank');
+}
+
+function handelEnter() {
+  console.log('enter');
+}
+
+// function handelChange(val) {
+//   console.log(val);
+// }
+
+function getExpirationWarningCount() {
+  getproductReturnPage({ pageNo: 1, pageSize: 10, remainingDays: 180 }).then((res) => {
+    total.value = res.data.total || 0;
+  });
+}
+
+getExpirationWarningCount();
+>>>>>>> v1.3
 </script>
 
 <style scoped lang="scss">
@@ -330,6 +386,7 @@ onMounted(() => {
   font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, 'Helvetica Neue', Arial, sans-serif;
   padding: 0;
 }
+<<<<<<< HEAD
 
 .header {
   height: 60px;
@@ -458,14 +515,22 @@ onMounted(() => {
   margin-bottom: 20px;
   
   .el-button{
+=======
+.awaitingBtn {
+  .el-button {
+>>>>>>> v1.3
     border: 1px #166773 solid;
     span {
       color: red;
       margin-left: 5px;
     }
   }
+<<<<<<< HEAD
   
   .el-button:hover{
+=======
+  .el-button:hover {
+>>>>>>> v1.3
     border: 1px #166773 solid;
     color: #166773;
     span {
@@ -473,6 +538,12 @@ onMounted(() => {
       margin-left: 5px;
     }
   }
+<<<<<<< HEAD
+=======
+  position: absolute;
+  top: 20px;
+  left: 20px;
+>>>>>>> v1.3
 }
 
 .section-title {