Explorar el Código

修改页面展示bug

oyq28 hace 3 años
padre
commit
fee01202b8

+ 2 - 2
imcs-ui/src/views/login/index.vue

@@ -683,7 +683,7 @@
    	/*background: url(../../assets/logo/logoBg1.jpg) 50% no-repeat;*/
    	/*background: url(../../assets/logo/logoBg2.png) 50% no-repeat;
     background-size: cover;*/
-   	background: $bg2_color;
+   	background: $bg1_color;
 
     width: 100%;
     height: 100vh;
@@ -731,7 +731,7 @@
       width: 320px;
       height: 440px;
       padding: 10px 36px 36px 36px;
-      background: $bg2_formbg;
+      background: $bg1_formbg;
       border-radius: 3px;
 
 			.el-tabs__item {

+ 9 - 0
imcs-ui/src/views/zuihou/classScheduleMgr/classScheduleMgr/components/Edit.vue

@@ -16,6 +16,7 @@
 			      value-format="yyyy-MM"
 			      :placeholder='$t("common.pleaseSelect")'
 			      style="width: 100%;"
+            :picker-options="pickerOptionsYearMonth"
 			    >
 			    </el-date-picker>
       </el-form-item>
@@ -52,6 +53,7 @@ export default {
       dicts:{
         NATION: {}
       },
+      pickerOptionsYearMonth: this.banTime(),
       roles: [],
       rules: {
         yearFull: [
@@ -167,6 +169,13 @@ export default {
           this.confirmDisabled = false
           return true
         })
+    },
+    banTime(){
+      return {
+          disabledDate(time) {
+            return time.getTime() <= Date.now();
+          }
+      }
     }
 
   }

+ 6 - 8
imcs-ui/src/views/zuihou/prepareProductMgr/technologyVersion/components/technologyMgr/index.vue

@@ -127,12 +127,12 @@
 	        column-key="operation"
 	        width="60px"
 	      >
-	        <template slot-scope="{ row }">
+	        <template slot-scope="scope">
 	          <el-tooltip class="item" :content='$t("common.delete")' effect="dark" placement="top-start">
 		          <i
 		            class="el-icon-delete table-operation"
 		            style="color: #f50;"
-		            @click="domDelete(row)"
+		            @click="domDelete(scope.row, scope.$index)"
 		          />
 	          </el-tooltip>
 	        </template>
@@ -333,19 +333,17 @@ export default {
 		this.tableData.data.push(obj)
   	},
   	// 【删除】按钮-事件(前端删除)
-  	domDelete(row){
+  	domDelete(row, index){
   		this.$confirm(this.$t("tips.comTips"), this.$t("common.tips"), {
       	distinguishCancelAndClose: true,
         confirmButtonText: this.$t("common.confirm"),
         cancelButtonText: this.$t("common.cancel"),
         type: "warning"
       }).then(() => {
-      	// 过滤我们需要的数据
-      	let list = this.tableData.data.filter(item => item.key != row.key || item.id != row.id)
-	  		// 给列表赋值
-	  		this.tableData.data = list
+      	// 过滤我们需要的数据		 
+		  this.tableData.data.splice(index, 1)		 
 	  		// 清除table的选中数据
-	  		this.$refs.table.toggleRowSelection(row, false)			
+	  	  this.$refs.table.toggleRowSelection(row, false)			
       }).catch(() => {})
   	},
     viewClose () {