一周工作安排获取当前星期、下拉框颜色

src/utils/supervision.js

@@ -16,7 +16,7 @@ export function parseTime(time, pattern) {
 		if ((typeof time === 'string') && (/^[0-9]+$/.test(time))) {
 			time = parseInt(time)
 		} else if (typeof time === 'string') {
-			time = time.replace(new RegExp(/-/gm), '/').replace('T', ' ').replace(new RegExp(/\.[\d]{3}/gm),'');
+			time = time.replace(new RegExp(/-/gm), '/').replace('T', ' ').replace(new RegExp(/\.[\d]{3}/gm), '');
 		}
 		if ((typeof time === 'number') && (time.toString().length === 10)) {
 			time = time * 1000
@@ -47,15 +47,13 @@ export function parseTime(time, pattern) {
 /**
  * 获取当前星期几
  */
- export function getNowWeek(now) {
-	//    var ssdate = new Date(now[0], parseInt(now[1] - 1), now[2]);
-    //    var  week1=String(ssdate.getDay()).replace("0","日").replace("1","一").replace("2","二").replace("3","三").replace("4","四").replace("5","五").replace("6","六")//就是你要的星期几
-    //    var week="星期"+week1
-	//    return week;
-
-	   var dateArray = now.split("-");
-	   var date = new Date(dateArray[0], parseInt(dateArray[1] - 1), dateArray[2]);
-	   return "星期" + "日一二三四五六".charAt(date.getDay());
+export function getNowWeek(now) {
+	if (now) {
+		var dateArray = now.split("-");
+		var date = new Date(dateArray[0], parseInt(dateArray[1] - 1), dateArray[2]);
+		return "星期" + "日一二三四五六".charAt(date.getDay());
+	}
+
 }
 
 // 表单重置
@@ -131,18 +129,18 @@ export function praseStrEmpty(str) {
 
 // 数据合并
 export function mergeRecursive(source, target) {
-    for (var p in target) {
-        try {
-            if (target[p].constructor == Object) {
-                source[p] = mergeRecursive(source[p], target[p]);
-            } else {
-                source[p] = target[p];
-            }
-        } catch(e) {
-            source[p] = target[p];
-        }
-    }
-    return source;
+	for (var p in target) {
+		try {
+			if (target[p].constructor == Object) {
+				source[p] = mergeRecursive(source[p], target[p]);
+			} else {
+				source[p] = target[p];
+			}
+		} catch (e) {
+			source[p] = target[p];
+		}
+	}
+	return source;
 };
 
 /**

src/views/combatduty/RateOfTen/index.vue

@@ -1548,7 +1548,7 @@ export default {
           {
             name: "",
             type: "pie",
-            radius: ["65%", "80%"],
+            radius: ["60%", "75%"],
             center: ["50%", "50%"],
             avoidLabelOverlap: false,
             hoverOffset: 5,

src/views/grassrootsregistration/bdglweekwork/index.vue

@@ -206,7 +206,7 @@
         append-to-body
         :inline="true"
       >
-        <el-form-item label="单位" prop="deptId">
+        <el-form-item label="单位" prop="unitId">
           <treeselect
             v-model="form.unitId"
             :options="deptOptions"
@@ -309,12 +309,14 @@
                 type="date"
                 value-format="yyyy-MM-dd"
                 placeholder="选择时间"
-                @change="change_time"
+                @change="(val)=>{
+                  change_time(val,i)
+                }"
               >
               </el-date-picker>
             </el-form-item>
             <el-form-item label="" prop="week">
-              <el-select v-model="item.week" placeholder="星期">
+              <!-- <el-select v-model="item.week" placeholder="星期">
                 <el-option
                   v-for="item in week"
                   :key="item.value"
@@ -323,7 +325,8 @@
                   class="input_xiala"
                 >
                 </el-option>
-              </el-select>
+              </el-select> -->
+              <el-input v-model="item.week" disabled/> 
             </el-form-item>
             <el-form-item label="" prop="day">
               <el-select v-model="item.dateline" placeholder="早晨">
@@ -361,7 +364,7 @@
               }"
             >
             </el-time-select>
-            <el-form-item label="" prop="unitId">
+            <el-form-item label="" prop="unitId5">
               <!-- <treeselect
                 v-model="item.unitId1"
                 :options="deptOptions"
@@ -521,7 +524,7 @@ export default {
       form: {},
       // 表单校验
       rules: {
-        deptId: [
+        unitId: [
           { required: true, message: "单位名称不能为空", trigger: "change" },
         ],
         startTime: [
@@ -640,9 +643,15 @@ export default {
       this.getList();
     },
 
-    change_time(date) {
-      console.log(`data${date}`);
-      console.log(this.getNowWeek(date));
+    change_time(date,i) {
+      console.log(`data${date}${i}`);
+      // console.log(this.getNowWeek(date));
+      if(date){
+         this.tomList[i].week = this.getNowWeek(date)
+         console.log(this.getNowWeek(date))
+      }else {
+         this.tomList[i].week = ""
+      }
     },
 
     // 搜索单位触发
@@ -1127,5 +1136,8 @@ export default {
 ::v-deep .el-picker-panel .el-scrollbar .time-select-item {
   color: #fff !important;
 }
-
+::v-deep .el-input.is-disabled .el-input__inner{
+  background-color: transparent !important;
+  color: #fff;
+}
 </style>