主控台 工作安排

src/api/pt.js

@@ -25,3 +25,21 @@ export function addNotice(data) {
     data: data
   })
 }
+
+// 查询公告列表
+export function listNotice(query) {
+  return request({
+    url: '/system/notice/lists',
+    method: 'get',
+    params: query
+  })
+}
+
+// 修改公告
+export function updateNotice(data) {
+  return request({
+    url: '/system/notice/updatePT',
+    method: 'put',
+    data: data
+  })
+}

src/assets/styles/global.css

@@ -1020,6 +1020,9 @@ margin-right: 34px;
   /* .el-input__inner {
     border: 1px solid white !important;
 } */
+#app .hideSidebar .main-container{
+  margin-left:50px;
+}
 
 /* 表单验证提示文字居左 */
 .el-form-item__error {

src/views/pt.vue

@@ -349,30 +349,6 @@
                   />
                 </div>
               </div>
-              <!-- <div class="num1-box-div">
-                <div class="num1-box-l">通知公告通知公告通知公告</div>
-                <div class="num1-box-r">
-                  <img src="../assets/images/通知 拷贝 3.png" alt />
-                </div>
-              </div>
-              <div class="num1-box-div">
-                <div class="num1-box-l">通知公告通知公告通知公告</div>
-                <div class="num1-box-r">
-                  <img src="../assets/images/通知 拷贝 3.png" alt />
-                </div>
-              </div>
-              <div class="num1-box-div">
-                <div class="num1-box-l">通知公告通知公告通知公告</div>
-                <div class="num1-box-r">
-                  <img src="../assets/images/通知 拷贝 3.png" alt />
-                </div>
-              </div>
-              <div class="num1-box-div">
-                <div class="num1-box-l">通知公告通知公告通知公告</div>
-                <div class="num1-box-r">
-                  <img src="../assets/images/通知 拷贝 3.png" alt />
-                </div>
-              </div> -->
             </div>
           </div>
         </div>
@@ -490,7 +466,8 @@
       >
         <el-row>
           <el-col :span="12">
-            <el-form-item label="公告标题"  prop="noticeTitle">
+            <p style="width:100%;height:30px;line-height:30px;color:#fff;fontSize:16px;" v-if="!ggflg" >公告标题:<span style="margin-left:10px;fontSize:14px;">{{form.noticeTitle}}</span></p>
+            <el-form-item label="公告标题" v-if="ggflg"  prop="noticeTitle">
               <el-input
                 v-model="form.noticeTitle"
                 placeholder="请输入公告标题"
@@ -624,6 +601,7 @@ export default {
       listNotice().then((res) => {
         console.log(res);
         this.noticeList = res.data;
+        console.log(this.noticeList)
       });
     },
     // 表单重置
@@ -839,17 +817,19 @@ export default {
       }, 10000); /* 每500毫秒执行一次，实现动态显示时间效果 */
     },
     tongzhifun() {
-      this.title = "添加通知通告";
-      this.open5 = true;
-      this.ggflg = true;
+      // this.title = "添加通知通告";
+      // this.open5 = true;
+      // this.ggflg = true;
+      // this.reset();
+      this.$router.push({ path: "/system/notice" }).catch(() => {});
     },
     submitForm() {
-      addNotice(this.form).then((response) => {
-        this.$modal.msgSuccess("新增成功");
-        this.open5 = false;
-        this.ggflg = false;
-        this.getlist();
-      });
+      // addNotice(this.form).then((response) => {
+      //   this.$modal.msgSuccess("新增成功");
+      //   this.open5 = false;
+      //   this.ggflg = false;
+      //   this.getlist();
+      // });
     },
     cancel() {
       this.open5 = false;
@@ -862,6 +842,7 @@ export default {
     tzggfun(item) {
       // console.log(item);
       // item.start = 1;
+       this.reset();
       this.form = item;
       updateNotice({
         noticeId: item.noticeId,
@@ -870,6 +851,7 @@ export default {
       }).then((res) => {
         if (res.code == 200) {
           this.getlist();
+         
         }
       });
       this.open5 = true;
@@ -1060,10 +1042,11 @@ hr {
   background: rgba(0, 246, 255, 0.3);
 }
 .num1-box-l {
-  flex: 1;
+  flex: 7;
   height: 100%;
   text-align: left;
   margin-left: 10px;
+  text-overflow:ellipsis;
 }
 .num1-box-r {
   flex: 3;
@@ -1093,7 +1076,7 @@ hr {
   background: rgba(0, 246, 255, 0.3);
 }
 .num1-ul-li-l {
-  flex: 1;
+  flex: 7;
   height: 100%;
   text-align: center;
 }
@@ -1112,7 +1095,7 @@ hr {
   line-height: 45px;
 }
 .num1-ul-title-l {
-  flex: 1;
+  flex: 7;
   height: 100%;
   text-align: center;
 }

src/views/workingArrangements/planTask/index.vue

@@ -1122,8 +1122,12 @@ export default {
       });
     },
     submitForm1() {
-      this.Progress.fileName=this.Progress.file[0].name
-      this.Progress.file=this.Progress.file[0].url
+      if (this.Progress.file) {
+            this.Progress.fileName = this.Progress.file[0].name;
+            this.Progress.file = this.Progress.file[0].url;
+          }
+      // this.Progress.fileName=this.Progress.file[0].name
+      // this.Progress.file=this.Progress.file[0].url
       this.$refs["Progress"].validate((valid) => {
         if (valid) {
           this.Progress.schedule = this.Progress.planProgress;

src/views/workingArrangements/workTask/index.vue

@@ -51,11 +51,7 @@
           <el-option label="保障部" value="safeguard"></el-option>
         </el-select>
       </el-form-item> -->
-      <el-form-item
-        prop="type"
-        class="plantypes"
-        label-width="80px"
-      >
+      <el-form-item prop="type" class="plantypes" label-width="80px">
         <el-select v-model="queryParams.types" placeholder="请选择任务类型">
           <el-option
             v-for="(item, i) in ziDian"
@@ -67,11 +63,7 @@
           </el-option>
         </el-select>
       </el-form-item>
-      <el-form-item
-        prop="adminId"
-        class="plantypes"
-        label-width="80px"
-      >
+      <el-form-item prop="adminId" class="plantypes" label-width="80px">
         <treeselect
           v-model="queryParams.adminId"
           :options="users"
@@ -722,7 +714,7 @@ export default {
         peopleName: [
           { required: true, message: "执行人不能为空", trigger: "blur" },
         ],
-        name: [{ required: true, message: "不能为空", trigger: "blur" }],
+        // name: [{ required: true, message: "不能为空", trigger: "blur" }],
         adminId: {
           required: true,
           message: "发布单位不能为空",
@@ -1099,8 +1091,11 @@ export default {
         if (valid) {
           this.Progress.taskId = this.jinduId;
           this.Progress.schedule = this.Progress.planProgress;
-          this.Progress.fileName = this.Progress.file[0].name;
-          this.Progress.file = this.Progress.file[0].url;
+          if (this.Progress.file) {
+            this.Progress.fileName = this.Progress.file[0].name;
+            this.Progress.file = this.Progress.file[0].url;
+          }
+
           console.log(this.Progress);
           uploadProgress(this.Progress).then((res1) => {
             this.$modal.msgSuccess("上传成功");