Browse Source

bug修改

asd26269546 1 năm trước cách đây
mục cha
commit
69cb338a0f

+ 1 - 1
src/views/finance/fundManage/funds/index.vue

@@ -32,7 +32,7 @@
       </byTable>
     </div>
 
-    <el-dialog title="打印" v-if="openPrint" v-model="openPrint" width="840px">
+    <el-dialog title="打印" v-if="openPrint" v-model="openPrint" width="640px">
       <div id="printMe">
         <FundsPDF :rowData="rowData"></FundsPDF>
       </div>

+ 32 - 1
src/views/index.vue

@@ -52,7 +52,20 @@
 			</div>
 			<div class="card">
 				<div class="commons-title">
-					业务提醒
+					在线统计时长
+				</div>
+				<div>
+					<el-table
+						:data="onLineInfoData"
+						style="width: 100%"
+						row-key="deptName"
+						lazy
+						:load="load"
+						:tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
+						>
+						<el-table-column prop="deptName" label="名称" />
+						<el-table-column prop="onLineTime" label="在线时长" />
+					</el-table>
 				</div>
 			</div>
 			<div class="card">
@@ -111,6 +124,7 @@ let toBeProcessedData = ref({
 	total:0,
 	rows:[]
 })
+let onLineInfoData = ref([])
 let haveInitiatedData = ref({
 	total:0,
 	rows:[]
@@ -158,6 +172,23 @@ const pushInfo = ref({
 	rows:[]
 })
 const getData = (() => {
+	
+	proxy.get('/onLineInfo/info',{
+		pageNum:1,
+		pageSize:5,
+	}).then(res=>{
+		onLineInfoData.value = res.data.deptList
+		//递归将数据内的deptList 改成 children
+		const changeData = (data) => {
+			data.forEach(item => {
+				if(item.deptList && item.deptList.length > 0) {
+					item.children = item.deptList
+					changeData(item.deptList)
+				}
+			})
+		}
+		changeData(onLineInfoData.value)
+	})
 	proxy.post('flowExample/getToBeProcessedPage',{
 		pageNum:1,
 		pageSize:4,

+ 1 - 1
src/views/purchaseManage/purchaseManage/alreadyPurchase/index.vue

@@ -143,7 +143,7 @@
       </template>
     </el-dialog>
 
-    <el-dialog title="打印" v-if="openPdf" v-model="openPdf" width="840px">
+    <el-dialog title="打印" v-if="openPdf" v-model="openPdf" width="640px">
       <!-- <div id="pdfDom" ref="pdfDom" style="width: 776px">
         <div style="border: 1px solid #000; border-collapse: collapse">
           <div style="text-align: right; padding: 2px 4px 0 0">

+ 2 - 2
src/views/salesMange/saleContract/priceSheet/index.vue

@@ -46,11 +46,11 @@
       </byTable>
     </div>
 
-    <el-dialog title="打印" v-if="openPrint" v-model="openPrint" width="860">
+    <el-dialog title="打印" v-if="openPrint" v-model="openPrint" width="640">
       <div id="printMe">
         <div
           id="pdfDom"
-          style="width: 800px; padding: 16px; font-size: 12px !important"
+          style="padding: 16px; font-size: 12px !important;font-family: 'msyh';"
         >
           <div style="font-size: 18px; text-align: center">
             {{