Merge branch 'master' of http://47.97.176.204:19000/wangwansu/iact_jiagou_drowio

src/views/archiEleRela/index.vue

@@ -70,7 +70,7 @@
 							<!-- <el-button :class="scope.row.state == 1 ? '':'editBtn'" icon="el-icon-edit" size="mini" @click="operate('edit',scope.row)" :disabled="scope.row.state == 1">编辑</el-button> -->
 							<el-button :class="scope.row.state == 1 ? '':'editBtn'" icon="el-icon-upload2" size="mini" @click="operate('pushEdit',scope.row)" :disabled="scope.row.state == 1">发布</el-button>
 							<el-button :class="scope.row.state != 1 ? '':'stopBtn'" icon="el-icon-remove-outline" size="mini" @click="operate('stop',scope.row)" :disabled="scope.row.state != 1">停用</el-button>
-							<el-button :class="scope.row.state == 1 ? '':'delBtn'" icon="el-icon-delete" size="mini" @click="operate('del',scope.row)" :disabled="scope.row.state == 1">删除</el-button>
+							<el-button :class="scope.row.state != 2 ? '':'delBtn'" icon="el-icon-delete" size="mini" @click="operate('del',scope.row)" :disabled="scope.row.state != 2">删除</el-button>
 						</div>
 					</template>
 				</el-table-column>
@@ -270,14 +270,14 @@ export default {
 			},
 			stateList: [
 				{
-					label: "已发布",
-					value: 1,
-				},
-				{
 					label: "已停用",
 					value: 0,
 				},
 				{
+					label: "已发布",
+					value: 1,
+				},
+				{
 					label: "暂存",
 					value: 2,
 				},
@@ -374,13 +374,16 @@ export default {
 		},
 		// 分页事件
 		handleSizeChange(val) {
+			this.page.current = 1;
+			this.params.current = 1;
+
 			this.page.size = val;
 			this.params.pageSize = val;
 			this.getList();
 		},
 		handleCurrentChange(val) {
 			this.page.current = val;
-			this.paramsp.current = val;
+			this.params.current = val;
 			this.getList();
 		},
 		// 所有操作
@@ -492,12 +495,13 @@ export default {
 				});
 			}else if (type == "del") {
 				// 删除
-				this.formData = item;
 				this.$confirm("确认删除吗", "提示", {
 					confirmButtonText: "确定",
 					cancelButtonText: "取消",
 					type: "warning"
 				}).then(() => {
+					this.formData = item;
+					this.formData.delFlag = 1;
 					getJGYSGLDel(this.formData).then(res => {
 						if (res.code == 200) {
 							this.$message.success("删除成功");
@@ -645,6 +649,9 @@ export default {
     	justify-content: flex-start;
     	align-items: center;
 	}
+	.add_dialog_content{
+		width: 100%;
+	}
 	.dialog_form_item3{
 		margin-top: 20px;
 		display: flex;
@@ -777,8 +784,9 @@ export default {
 		display: flex;
 		align-items: center;
 		margin-bottom: 10px;
+		width: 100%;
 		.formArea{
-			width: 900px;
+			width: 100%;
 			border-radius: 5px;
 			border: 1px solid #0D867F;
 			margin-top: 10px;
@@ -787,24 +795,23 @@ export default {
 				align-items: center;
 				height: 50px;
 				margin-left: 10px;
+				width: 100%;
 				.formItem{
 					margin-left: 15px;
 					display: flex;
 					align-items: center;
+					width: 27%;
 					.label{
-						width: 70px;
+						width: 38%;
 						text-align: right;
 						margin-right: 5px;
 					}
-					/deep/.el-select{
-						width: 140px;
-					}
 					/deep/.el-input{
-						width: 140px;
+						width: 95%;
 					}
 				}
 				.newBtn{
-					margin-left: 15px;
+					width: 7%;
 					.addItem{
 						background-color: #0D867F;
 						color: #fff;

src/views/archiViewConfig/index.vue

@@ -219,14 +219,14 @@ export default {
 			},
 			stateList: [
 				{
-					label: "已发布",
-					value: 1,
-				},
-				{
 					label: "已停用",
 					value: 0,
 				},
 				{
+					label: "已发布",
+					value: 1,
+				},
+				{
 					label: "暂存",
 					value: 2,
 				},
@@ -337,6 +337,9 @@ export default {
 		},
 		// 分页事件
 		handleSizeChange(val) {
+			this.page.current = 1;
+			this.params.current = 1;
+			
 			this.page.size = val;
 			this.params.pageSize = val;
 			this.getList();
@@ -504,6 +507,7 @@ export default {
 					type: "warning"
 				}).then(() => {
 					this.formData = item;
+					this.formData.delFlag = 1;
 					getJGSTPZDel(this.formData).then(res => {
 						if (res.code == 200) {
 							this.$message.success("删除成功");

src/views/etpManage/index.vue

@@ -313,13 +313,16 @@ export default {
 		},
 		// 分页事件
 		handleSizeChange(val) {
+			this.page.current = 1;
+			this.params.current = 1;
+
 			this.page.size = val;
 			this.params.pageSize = val;
 			this.getList();
 		},
 		handleCurrentChange(val) {
 			this.page.current = val;
-			this.paramsp.current = val;
+			this.params.current = val;
 			this.getList();
 		},
 		// 所有操作

src/views/metaModelDic/pages/page1.vue

@@ -180,27 +180,27 @@
 			width="40%">
 			<div class="add_dialog_content">
 				<div class="dialog_content_1">
-					<div class="dialog_form_item">
+					<div class="dialog_form_item2">
 						<div class="dialog_form_item_title"><span class="reqIcon">*</span>字段名</div>
 						<el-input placeholder="" class="dialog_form_item_content" v-model="formData2.fieldName" @input="formData2.fieldName=formData2.fieldName.replace(/[^a-zA-Z]/g,'')"></el-input>
 					</div>
-					<div class="dialog_form_item">
+					<div class="dialog_form_item2">
 						<div class="dialog_form_item_title"><span class="reqIcon">*</span>中文名</div>
 						<el-input placeholder="" class="dialog_form_item_content" v-model="formData2.chineseName"></el-input>
 					</div>
 				</div>
 				<div class="dialog_content_1">
-					<div class="dialog_form_item">
+					<div class="dialog_form_item2">
 						<div class="dialog_form_item_title"><span class="reqIcon">*</span>排序</div>
 						<el-input placeholder="" class="dialog_form_item_content" v-model="formData2.displayOrder"></el-input>
 					</div>
-					<div class="dialog_form_item">
+					<div class="dialog_form_item2">
 						<div class="dialog_form_item_title"><span class="reqIcon">*</span>长度</div>
 						<el-input placeholder="" class="dialog_form_item_content" v-model="formData2.contentLength"></el-input>
 					</div>
 				</div>
 				<div class="dialog_content_1">
-					<div class="dialog_form_item">
+					<div class="dialog_form_item2">
 						<div class="dialog_form_item_title"><span class="reqIcon">*</span>控件</div>
 						<el-select v-model="formData2.controlType" placeholder="请选择" class="search_item">
 							<el-option v-for="(item,idnex) in selectTypeList" :key="idnex" :label="item.label" :value="item.value" ></el-option>
@@ -374,13 +374,16 @@ export default {
 		},
 		// 分页事件
 		handleSizeChange(val) {
+			this.page.current = 1;
+			this.params.current = 1;
+			
 			this.page.size = val;
 			this.params.pageSize = val;
 			this.getList();
 		},
 		handleCurrentChange(val) {
 			this.page.current = val;
-			this.paramsp.current = val;
+			this.params.current = val;
 			this.getList();
 		},
 		// 所有操作
@@ -653,17 +656,33 @@ export default {
 			color: #fff;
 		}
 	}
+	.add_dialog_content{
+		width: 100%;
+	}
 	.dialog_content_1{
+		width: 100%;
 		display: flex;
     	justify-content: space-between;
+		.dialog_form_item{
+			width: 33%;
+			display: flex;
+			align-items: center;
+			margin-bottom: 10px;
+		}
+		.dialog_form_item2{
+			width: 50%;
+			display: flex;
+			align-items: center;
+			margin-bottom: 10px;
+		}
 		.dialog_form_item_title{
-			width: 90px;
+			width: 20%;
 		}
 		.el-input{
-			width: 260px;
+			width: 80%;
 		}
 		.el-select{
-			width: 260px;
+			width: 80%;
 		}
 	}
 	.search_menu{
@@ -772,11 +791,6 @@ export default {
 	.el-pagination{
 		margin-top: 50px;
 	}
-	.dialog_form_item{
-		display: flex;
-		align-items: center;
-		margin-bottom: 10px;
-	}
 	.dialog_form_item_title{
 		flex-shrink: 0;
 		margin-right: 15px;

src/views/metaModelDic/pages/page2.vue

@@ -353,13 +353,16 @@ export default {
 		},
 		// 分页事件
 		handleSizeChange(val) {
+			this.page.current = 1;
+			this.params.current = 1;
+			
 			this.page.size = val;
 			this.params.pageSize = val;
 			this.getList();
 		},
 		handleCurrentChange(val) {
 			this.page.current = val;
-			this.paramsp.current = val;
+			this.params.current = val;
 			this.getList();
 		},
 		// 所有操作

src/views/metaModelDic/pages/page3.vue

@@ -418,13 +418,16 @@ export default {
 		},
 		// 分页事件
 		handleSizeChange(val) {
+			this.page.current = 1;
+			this.params.current = 1;
+			
 			this.page.size = val;
 			this.params.pageSize = val;
 			this.getList();
 		},
 		handleCurrentChange(val) {
 			this.page.current = val;
-			this.paramsp.current = val;
+			this.params.current = val;
 			this.getList();
 		},
 		// 所有操作

src/views/total-archi-property-document/index.vue

@@ -378,12 +378,16 @@ export default {
 		// 每页条数改变
 		handleSizeChange(val) {
 			this.pager.current = 1;
+			this.params.current = 1;
+
 			this.pager.size = val;
+			this.params.pageSize = val;
 			this.getList();
 		},
 		//当前页码改变
 		handleCurrentChange(val) {
 			this.pager.current = val;
+			this.params.current = val;
 			this.getList();
 		},
 		

src/views/typical-example-manage/index.vue

@@ -470,12 +470,16 @@ export default {
 		// 每页条数改变
 		handleSizeChange(val) {
 			this.pager.current = 1;
+			this.params.current = 1;
+
 			this.pager.size = val;
+			this.params.pageSize = val;
 			this.getList();
 		},
 		//当前页码改变
 		handleCurrentChange(val) {
 			this.pager.current = val;
+			this.params.current = val;
 			this.getList();
 		},
 	}

src/views/typical-example-relative-use/index.vue

@@ -357,13 +357,17 @@ export default {
 		// 每页条数改变
 		handleSizeChange(val) {
 			this.pager.current = 1;
+			this.params.current = 1;
+
 			this.pager.size = val;
-			this.get_table();
+			this.params.pageSize = val;
+			this.getList();
 		},
 		//当前页码改变
 		handleCurrentChange(val) {
 			this.pager.current = val;
-			this.get_table();
+			this.params.current = val;
+			this.getList();
 		},
 	}
 }