yangg 21 giờ trước cách đây
mục cha
commit
5c0a7e1da3

+ 13 - 13
src/views/system/contract/crud.tsx

@@ -105,7 +105,7 @@ export const createCrudOptions = function ({ crudExpose }: CreateCrudOptionsProp
 					form: { show: false },
 					column: { type: 'index', align: 'center', width: '70px', columnSetDisabled: true },
 				},
-				contract_number: {
+				contract_no: {
 					title: '合约编号',
 					search: { show: true },
 					type: 'input',
@@ -145,7 +145,7 @@ export const createCrudOptions = function ({ crudExpose }: CreateCrudOptionsProp
 						minWidth: 180
 					}
 				},
-				contract_name: {
+				title: {
 					title: '合约名称',
 					search: { show: true },
 					type: 'input',
@@ -179,7 +179,7 @@ export const createCrudOptions = function ({ crudExpose }: CreateCrudOptionsProp
 					},
 					column: { minWidth: 120 },
 				},
-				contract_amount: {
+				total_amount: {
 					title: '合约金额',
 					type: 'number',
 					form: {
@@ -192,7 +192,7 @@ export const createCrudOptions = function ({ crudExpose }: CreateCrudOptionsProp
 					},
 					column: { minWidth: 120 },
 				},
-				start_date: {
+				effective_date: {
 					title: '开始时间',
 					type: 'datetime',
 					search: { show: true },
@@ -204,7 +204,7 @@ export const createCrudOptions = function ({ crudExpose }: CreateCrudOptionsProp
 					},
 					column: { minWidth: 150 },
 				},
-				end_date: {
+				expire_date: {
 					title: '结束时间',
 					type: 'datetime',
 					search: { show: true },
@@ -232,7 +232,7 @@ export const createCrudOptions = function ({ crudExpose }: CreateCrudOptionsProp
 						]
 					}),
 				},
-				contact_person: {
+				party_b_contact: {
 					title: '联系人',
 					type: 'input',
 					form: {
@@ -241,7 +241,7 @@ export const createCrudOptions = function ({ crudExpose }: CreateCrudOptionsProp
 					},
 					column: { minWidth: 120 },
 				},
-				contact_phone: {
+				party_b_phone: {
 					title: '联系电话',
 					type: 'input',
 					form: {
@@ -253,7 +253,7 @@ export const createCrudOptions = function ({ crudExpose }: CreateCrudOptionsProp
 					},
 					column: { minWidth: 130 },
 				},
-				contact_email: {
+				/* contact_email: {
 					title: '联系邮箱',
 					type: 'input',
 					form: {
@@ -264,8 +264,8 @@ export const createCrudOptions = function ({ crudExpose }: CreateCrudOptionsProp
 						component: { placeholder: '请输入联系邮箱' }
 					},
 					column: { minWidth: 180 },
-				},
-				service_description: {
+				}, */
+				contract_type_display: {
 					title: '服务描述',
 					type: 'textarea',
 					form: {
@@ -279,7 +279,7 @@ export const createCrudOptions = function ({ crudExpose }: CreateCrudOptionsProp
 					},
 					column: { minWidth: 200 },
 				},
-				payment_method: {
+				/* payment_method: {
 					title: '支付方式',
 					type: 'dict-select',
 					form: {
@@ -294,8 +294,8 @@ export const createCrudOptions = function ({ crudExpose }: CreateCrudOptionsProp
 							{ value: 3, label: '其他' }
 						]
 					}),
-				},
-				remarks: {
+				}, */
+				remark: {
 					title: '备注',
 					type: 'textarea',
 					form: { 

+ 1 - 1
src/views/system/device/crud.tsx

@@ -254,7 +254,7 @@ export const createCrudOptions = function ({ crudExpose }: CreateCrudOptionsProp
 							minWidth: 100,
 							formatter: ({ row }) => {
 								const isBorrowed = row.borrowed_quantity > 0;
-								const label = isBorrowed ? row.total_quantity==0?'不可借':'在借' : row.total_quantity==0?'不可借':'空闲';
+								const label = isBorrowed ? row.total_quantity-row.borrowed_quantity==0?'不可借':'在借' : row.total_quantity==0?'不可借':'空闲';
 								const color = isBorrowed ? '#FFA500' : '#4CAF50';
 								return h(
 									'span',

+ 2 - 0
src/views/system/devicepreserveplan/crud.tsx

@@ -204,7 +204,9 @@ export const createCrudOptions = function ({ crudExpose }: CreateCrudOptionsProp
 					},
 					dict: dict({
 						data: [
+							{ label: '每月', value: 2 },
 							{ label: '每季度', value: 3 },
+							{ label: '每年', value: 5 },
 
 						],
 					}),

+ 1 - 1
src/views/system/login/index.vue

@@ -12,7 +12,7 @@
 			</div>
 		</div>
 		<div class="login-right flex z-10">
-			<div class="login-right-warp-mian-title">客户服务专线:021-8888888</div>
+			<!-- <div class="login-right-warp-mian-title">客户服务专线:021-8888888</div> -->
 			
 			<div class="login-right-warp flex-margin">
 				

+ 2 - 0
src/views/system/screenconsole/component/BorrowRankingList.vue

@@ -58,6 +58,7 @@
 import { ref, onMounted } from 'vue'
 import * as api from '../api'
 import { GetList } from '../../devicelabel/api'
+import { Session } from '/@/utils/storage';
 
 interface RankingItem {
   user_id: number
@@ -117,6 +118,7 @@ const getList = async () => {
 
 onMounted(() => {
   fetchRanking()
+  if(Session.get('userInfo').username =='平台管理员') return
   getList()
 })
 </script>

+ 4 - 0
src/views/system/screenconsole/index.vue

@@ -44,6 +44,8 @@ import UtilizationTrend from './component/UtilizationTrend.vue'
 import BorrowTrendsChart from './component/BorrowTrendsChart.vue'
 import ActiveUsersPie from './component/ActiveUsersPie.vue'
 import BorrowRankingList from './component/BorrowRankingList.vue'
+import { Session } from '/@/utils/storage';
+import { userInfo } from 'os';
 // import test from './component/test.vue'
 // import test1 from './component/test1.vue'
 
@@ -93,6 +95,8 @@ const dataSummary = ref({
 
 onMounted(async () => {
   try {
+	console.log(Session.get('userInfo'));
+	if(Session.get('userInfo').username =='平台管理员') return
     const res = await api.GetList()
     if (res.code === 2000) {
       pendingItems.value = res.data.pending_items