优化全局系统设置

src/views/allocation/allocationList.vue

@@ -9,11 +9,11 @@
 					</el-table-column>
 					<el-table-column prop="value" label="内容" width="500">
 					</el-table-column>
-					<el-table-column label="是否返回给App">
+					<el-table-column label="是否返回给App" prop="isAppUse" width="120">
 						<template slot-scope="scope">
-							<el-switch v-model="scope.row.isAppUse"
+							<!-- <el-switch v-model="scope.row.isAppUse" @change="updateAmendNotice($event, scope.row)"
-							@change="updateAmendNotice($event,scope.row)"
+								:active-value="1" :inactive-value="0"></el-switch> -->
-							:active-value="1" :inactive-value="0"></el-switch>
+							{{ scope.row.isAppUse == 1 ? '是' : '否' }}
 						</template>
 					</el-table-column>
 					<el-table-column prop="createAt" label="创建时间">
@@ -35,7 +35,9 @@
 					</el-table-column>
 					<el-table-column prop="value" label="内容" width="500">
 						<template slot-scope="scope">
-						  <div style="display: -webkit-box;-webkit-box-orient: vertical;-webkit-line-clamp: 3;overflow: hidden;max-height:80px;">{{scope.row.value}}</div>
+							<div
+								style="display: -webkit-box;-webkit-box-orient: vertical;-webkit-line-clamp: 3;line-clamp: 3;overflow: hidden;max-height:80px;">
+								{{ scope.row.value }}</div>
 						</template>
 					</el-table-column>
 					<el-table-column prop="createAt" label="创建时间">
@@ -114,8 +116,8 @@
 					<el-table-column prop="value" label="内容" width="500">
 						<template slot-scope="scope">
 							<div
-								style="display: -webkit-box;-webkit-box-orient: vertical;-webkit-line-clamp: 4;overflow: hidden;">
+								style="display: -webkit-box;-webkit-box-orient: vertical;-webkit-line-clamp: 4;line-clamp: 4;overflow: hidden;">
-								{{scope.row.value}}</div>
+								{{ scope.row.value }}</div>
 						</template>
 					</el-table-column>
 					<el-table-column prop="createAt" label="创建时间">
@@ -175,7 +177,9 @@
 					</el-table-column>
 					<el-table-column prop="value" label="内容" width="500">
 						<template slot-scope="scope">
-			        <div style="display: -webkit-box;-webkit-box-orient: vertical;-webkit-line-clamp: 3;overflow: hidden;max-height:80px;">{{scope.row.value}}</div>
+							<div
+								style="display: -webkit-box;-webkit-box-orient: vertical;-webkit-line-clamp: 3;line-clamp: 3;overflow: hidden;max-height:80px;">
+								{{ scope.row.value }}</div>
 						</template>
 					</el-table-column>
 					<el-table-column prop="createAt" label="创建时间">
@@ -197,7 +201,9 @@
 					</el-table-column>
 					<el-table-column prop="value" label="内容" width="500">
 						<template slot-scope="scope">
-			        <div style="display: -webkit-box;-webkit-box-orient: vertical;-webkit-line-clamp: 3;overflow: hidden;max-height:80px;">{{scope.row.value}}</div>
+							<div
+								style="display: -webkit-box;-webkit-box-orient: vertical;-webkit-line-clamp: 3;line-clamp: 3;overflow: hidden;max-height:80px;">
+								{{ scope.row.value }}</div>
 						</template>
 					</el-table-column>
 					<el-table-column prop="createAt" label="创建时间">
@@ -239,8 +245,8 @@
 					<el-table-column prop="value" label="内容">
 						<template slot-scope="scope">
 							<div
-								style="display: -webkit-box;-webkit-box-orient: vertical;-webkit-line-clamp: 3;overflow: hidden;max-height:80px;">
+								style="display: -webkit-box;-webkit-box-orient: vertical;-webkit-line-clamp: 3;line-clamp: 3;overflow: hidden;max-height:80px;">
-								{{scope.row.value}}
+								{{ scope.row.value }}
 							</div>
 						</template>
 					</el-table-column>
@@ -263,19 +269,22 @@
 					<el-input v-model="form.min" style="width:65%;" readonly></el-input>
 				</el-form-item>
 				<el-form-item label="内容：" :label-width="formLabelWidth">
-					<quill-editor v-if="form.conditionFrom=='xieyi'" ref="myTextEditor" v-model="form.value" :options="quillOption"
+					<quill-editor v-if="form.conditionFrom == 'xieyi'" ref="myTextEditor" v-model="form.value"
+						:options="quillOption"
 						style="padding-bottom: 50px;height: 300px;width: 72%;display: inline-table;margin-bottom: 60px;">
 					</quill-editor>
-					<div v-else-if="form.conditionFrom=='image'">
+					<div v-else-if="form.conditionFrom == 'image'">
 						<!-- <el-input v-model="form.value" style="width:65%;"></el-input> -->
 						<el-upload class="avatar-uploader" v-model="form.value"
 							:action="$http.adornUrlUp('alioss/upload')" :show-file-list="false"
 							:on-success="handleAvatarSuccess1">
-							<img v-if="form.value" :src="form.value" class="avatar" style="width: 148px;height: 148px;" />
+							<img v-if="form.value" :src="form.value" class="avatar"
-							<i v-else class="el-icon-plus avatar-uploader-icon" style="font-size: 28px;color: #8c939d"></i>
+								style="width: 148px;height: 148px;" />
+							<i v-else class="el-icon-plus avatar-uploader-icon"
+								style="font-size: 28px;color: #8c939d"></i>
 						</el-upload>
 					</div>
-					<div v-else-if="form.conditionFrom=='kaiguan'">
+					<div v-else-if="form.conditionFrom == 'kaiguan'">
 						<div>
 							<el-radio-group v-model="form.value">
 								<el-radio label="是">是</el-radio>
@@ -288,7 +297,11 @@
 				</el-form-item>
 
 				<el-form-item label="是否返回给App" :label-width="formLabelWidth">
-					<el-switch v-model="form.isAppUse" :active-value="1" :inactive-value="0"></el-switch>
+					<!-- <el-switch v-model="form.isAppUse" :active-value="1" :inactive-value="0"></el-switch> -->
+					<el-radio-group v-model="form.isAppUse">
+						<el-radio :label="1">是</el-radio>
+						<el-radio :label="0">否</el-radio>
+					</el-radio-group>
 				</el-form-item>
 			</el-form>
 			<div slot="footer" class="dialog-footer">
@@ -300,14 +313,14 @@
 </template>
 
 <script>
-	import {
+import {
 	quillEditor
-	} from 'vue-quill-editor'
+} from 'vue-quill-editor'
-	import 'quill/dist/quill.core.css'
+import 'quill/dist/quill.core.css'
-	import 'quill/dist/quill.snow.css'
+import 'quill/dist/quill.snow.css'
-	import 'quill/dist/quill.bubble.css'
+import 'quill/dist/quill.bubble.css'
-	import quillConfig from '../locality/quill-config.js'
+import quillConfig from '../locality/quill-config.js'
-	export default {
+export default {
 	components: {
 		quillEditor
 	},
@@ -425,7 +438,7 @@
 			this.form.isAppUse = rows.isAppUse;
 			this.form.conditionFrom = rows.conditionFrom
 		},
-			updateAmendNotice(e,row){
+		updateAmendNotice(e, row) {
 			this.$http({
 				url: this.$http.adornUrl('common/update'),
 				method: 'post',
@@ -547,17 +560,17 @@
 		},
 		handleAvatarSuccess1(file, fileList) {
 			this.form.value = file.data
-				console.log('file.data',file.data)
+			console.log('file.data', file.data)
 		},
 	},
 	mounted() {
 		this.dataSelect()
 	}
-	}
+}
 </script>
 
 <style scoped="scoped">
-	.eit {
+.eit {
 	height: 120px;
-	}
+}
 </style>