提交代码

VinnoManagementSystem/src/components/scTable/index.vue

@@ -207,6 +207,7 @@
 						this.summary = response.summary || {};
 					}
 					this.loading = false;
+					this.selectIndexs = [];
 				}
 				this.$refs.scTable.$el.querySelector('.el-table__body-wrapper').scrollTop = 0
 				var res = {

VinnoManagementSystem/src/layout/index.vue

@@ -186,3 +186,80 @@
 		}
 	}
 </script>
+
+<style >
+@media (max-width: 1000px){
+	.el-message-box {
+		--el-messagebox-title-color: var(--el-text-color-primary);
+		--el-messagebox-width: 320px;
+		--el-messagebox-border-radius: 4px;
+		--el-messagebox-font-size: var(--el-font-size-large);
+		--el-messagebox-content-font-size: var(--el-font-size-base);
+		--el-messagebox-content-color: var(--el-text-color-regular);
+		--el-messagebox-error-font-size: 12px;
+		--el-messagebox-padding-primary: 15px;
+		display: inline-block;
+		width: var(--el-messagebox-width);
+		padding-bottom: 10px;
+		vertical-align: middle;
+		background-color: var(--el-color-white);
+		border-radius: var(--el-messagebox-border-radius);
+		border: 1px solid var(--el-border-color-lighter);
+		font-size: var(--el-messagebox-font-size);
+		box-shadow: var(--el-box-shadow-light);
+		text-align: left;
+		overflow: hidden;
+		-webkit-backface-visibility: hidden;
+		backface-visibility: hidden;
+	}
+}
+@media (min-width: 1250px){
+	.el-message-box {
+		--el-messagebox-title-color: var(--el-text-color-primary);
+		--el-messagebox-width: 420px;
+		--el-messagebox-border-radius: 4px;
+		--el-messagebox-font-size: var(--el-font-size-large);
+		--el-messagebox-content-font-size: var(--el-font-size-base);
+		--el-messagebox-content-color: var(--el-text-color-regular);
+		--el-messagebox-error-font-size: 12px;
+		--el-messagebox-padding-primary: 15px;
+		display: inline-block;
+		width: var(--el-messagebox-width);
+		padding-bottom: 10px;
+		vertical-align: middle;
+		background-color: var(--el-color-white);
+		border-radius: var(--el-messagebox-border-radius);
+		border: 1px solid var(--el-border-color-lighter);
+		font-size: var(--el-messagebox-font-size);
+		box-shadow: var(--el-box-shadow-light);
+		text-align: left;
+		overflow: hidden;
+		-webkit-backface-visibility: hidden;
+		backface-visibility: hidden;
+	}
+}
+.el-dialog__header {
+    padding: var(--el-dialog-padding-primary);
+    padding-bottom: 10px;
+	border-bottom: 2px solid rgba(0,0,0,.06);
+ }
+.el-dialog__body {
+    padding: calc(var(--el-dialog-padding-primary) + 10px) var(--el-dialog-padding-primary);
+    color: var(--el-text-color-regular);
+    font-size: var(--el-dialog-content-font-size);
+    word-break: break-all;
+    padding-top: 10px;
+    padding-bottom: 10px;
+}
+.el-dialog__footer {
+    padding: var(--el-dialog-padding-primary);
+    padding-top: 10px;
+    text-align: right;
+    box-sizing: border-box;
+    border-top: 2px solid rgba(0,0,0,.06);
+}
+.el-form-item__label {
+    font-weight: bold;
+    line-height: 32px;
+}
+</style>

VinnoManagementSystem/src/locales/lang/en.js

@@ -257,5 +257,6 @@ export default {
 		confirmCancelShareDevice:"Cancel Share This Device?",
 		removeDeviceBindUsers:"This operation will unbind the share user. Continue or not?",
 		rejectReasonRequired: "RejectReason Required",
+		deviceImage: "Device Image",
 	}
 }

VinnoManagementSystem/src/locales/lang/zh-cn.js

@@ -258,5 +258,6 @@ export default {
 		confirmCancelShareDevice: "取消分享当前设备？",
 		removeDeviceBindUsers: "此操作将解除已绑定的分享用户, 是否继续？",
 		rejectReasonRequired: "拒绝原因必填",
+		deviceImage: "设备图像",
 	},
 }

VinnoManagementSystem/src/views/deviceManage/deviceList.vue

@@ -17,6 +17,11 @@
 				<el-table-column label="#" type="index" width="40" align="center" ></el-table-column>
 				<el-table-column :label="$t('device.deviceID')" prop="DeviceCode" width="150" align="center" ></el-table-column>
 				<el-table-column :label="$t('device.deviceName')" prop="Name" width="120" align="center" ></el-table-column>
+				<el-table-column :label="$t('device.deviceImage')" align="center" width="150">
+					<template #default="scope">
+						<el-avatar :src="setDefaultImage(scope.row.HeadPicUrl)" size="large" shape="circle " style="width:80px;height:80px;"></el-avatar>
+					</template>
+				</el-table-column>
 				<el-table-column :label="$t('device.deviceTypeName')" prop="DeviceTypeName" width="100" align="center" ></el-table-column>
                 <el-table-column :label="$t('device.deviceModelName')" prop="DeviceModelName" width="120" align="center" ></el-table-column>
                 <el-table-column :label="$t('response.description')" prop="Description" width="150" align="center" ></el-table-column>
@@ -130,6 +135,48 @@
 			handleShareSuccess(){
                 this.$refs.table.refresh()
 			},
+			//设置默认图像
+            setDefaultImage(str) {
+				if (str === null || str === undefined || str.length <= 0)
+				{
+					var returnValue = "";
+					var result = 0;
+					var val = Math.round(Math.random()*10);
+					if (val % 2 == 0)
+					{
+						result = val / 2;
+					}
+					else
+					{
+						result = val % 2;
+					}
+					if (result == 1)
+					{
+					 	returnValue = "http://192.168.6.117:9001/Flyinsono-BJ-1300984704.VCS.AP-BeiJing/Vinno_CC_G86.PNG";
+					}
+					else if (result == 2)
+					{
+					 	returnValue = "http://192.168.6.117:9001/Flyinsono-BJ-1300984704.VCS.AP-BeiJing/Vinno_CC_M86.PNG";
+					}
+					else if (result == 3)
+					{
+					 	returnValue = "http://192.168.6.117:9001/Flyinsono-BJ-1300984704.VCS.AP-BeiJing/Vinno_CC_M80.PNG";
+					}
+					else if (result == 4)
+					{
+					 	returnValue = "http://192.168.6.117:9001/Flyinsono-BJ-1300984704.VCS.AP-BeiJing/Vinno_CC_70.PNG";
+					}
+					else
+					{
+						returnValue = "http://192.168.6.117:9001/Flyinsono-BJ-1300984704.VCS.AP-BeiJing/Vinno_CC_G86.PNG";
+					}
+					return returnValue;
+				}
+				else
+				{
+					return str;
+				}
+            },
 		}
 	}
 </script>