思想政治

src/api/thought/teacherFile.js

@@ -59,3 +59,19 @@ export function listmulu(query) {
     params: query
   })
 }
+
+// 查询上传文件目录列表
+export function listread(data) {
+  return request({
+    url: '/thought/teacherFile/update',
+    method: 'put',
+    data: data
+  })
+}
+// 获取排行列表接口
+export function rankList() {  
+  return request({
+    url:"/thought/teacherFile/getReadRanking",
+    method:"get"
+  })
+}

src/assets/styles/global.css

@@ -1144,20 +1144,15 @@ input:-moz-placeholder {
 .el-tree-node:focus>.el-tree-node__content {
   background-color: transparent;
 }
-
-
-
 /* 树形控件滚动条修饰 */
 .userAgrees::-webkit-scrollbar {
   width: 10px;
   background: transparent;
 }
-
 .userAgrees::-webkit-scrollbar {
   width: 14px;
   background: transparent;
 }
-
 .userAgrees::-webkit-scrollbar-thumb {
   background: #114d7a;
 }

src/views/regulations/fileinfo/index.vue

@@ -298,7 +298,7 @@
               <!-- <img src="../../../images/upRow.png" alt="" style="position:absolute;top:18px;right:158px" > -->
               <!-- <img src="../../../images/downRow.png" alt=""  style="position:absolute;top:17px;right:158px"> -->
               本月阅读量
-              <span style="color: red; margin-left: 5px">{{
+              <span style="margin-left: 5px" :class="index<3?'green':'red'">{{
                 item.readnumber1
               }}</span>
             </td>
@@ -1186,6 +1186,12 @@ export default {
 </script>
 
 <style scoped>
+.red{
+  color: #FF4949;
+}
+.green{
+  color: #13CE66;
+}
 /* ::v-deep .el-dialog__body{
   overflow: auto !important;
   height: 600px !important;

src/views/thought/getready/index.vue

@@ -216,7 +216,19 @@
     >
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="序号" type="index" width="50" align="center" />
-      <el-table-column label="参加人" align="center" prop="talkPeople" show-overflow-tooltip :formatter="unit2Format"/>
+      <el-table-column label="教育议题" align="center" prop="talkTheme" show-overflow-tooltip/>
+       <el-table-column
+        label="教育议题简介"
+        align="center"
+        prop="talkIntroduction"
+        show-overflow-tooltip
+      />
+        <el-table-column label="教育内容" align="center" prop="talkContent" show-overflow-tooltip>
+        <template slot-scope="scope">
+          <span>{{ onEditor(scope.row.talkContent) }}</span>
+        </template>
+      </el-table-column>
+      
       <el-table-column
         label="开始时间"
         align="center"
@@ -227,6 +239,9 @@
           <span>{{ parseTime(scope.row.startTime, "{y}-{m}-{d}") }}</span>
         </template>
       </el-table-column>
+      <el-table-column label="组织人" align="center" prop="createName" width="100" />
+       <el-table-column label="记录人" align="center" prop="recorder" width="100" />
+       <el-table-column label="参加人" align="center" prop="talkPeople" show-overflow-tooltip :formatter="unit2Format"/>
       <el-table-column
         label="结束时间"
         align="center"
@@ -237,31 +252,29 @@
           <span>{{ parseTime(scope.row.endTime, "{y}-{m}-{d}") }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="组织人" align="center" prop="createName" />
+      
       <!-- <el-table-column label="创建人id" align="center" prop="createId" /> -->
       <!-- <el-table-column label="文件路径" align="center" prop="filePath" /> -->
-      <el-table-column label="文件名称" align="center" prop="fileName" show-overflow-tooltip/>
-      <el-table-column label="教育内容" align="center" prop="talkContent" show-overflow-tooltip>
-        <template slot-scope="scope">
-          <span>{{ onEditor(scope.row.talkContent) }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="教育议题" align="center" prop="talkTheme" show-overflow-tooltip/>
-      <el-table-column
-        label="教育议题简介"
-        align="center"
-        prop="talkIntroduction"
-        show-overflow-tooltip
-      />
-      <el-table-column label="记录人" align="center" prop="recorder" />
+      <!-- <el-table-column label="文件名称" align="center" prop="fileName" show-overflow-tooltip/> -->
+    
+      
+     
+     
       <!-- <el-table-column label="记录人id" align="center" prop="recorderId" /> -->
       <el-table-column
         label="操作"
         align="center"
         class-name="small-padding fixed-width"
-        width="150px"
+        width="200px"
       >
         <template slot-scope="scope">
+           <el-button
+            size="btk"
+            type="text"
+            @click="handlelook(scope.row)"
+            v-hasPermi="['thought:getready:edit']"
+            >查看</el-button
+          >
           <el-button
             size="btu"
             type="text"
@@ -463,6 +476,158 @@
         <el-button @click="cancel" size="btn">取 消</el-button>
       </div>
     </el-dialog>
+    <!-- 查看教育准备会 -->
+    <el-dialog
+      :title="title1"
+      :visible.sync="open1"
+      width="1080px"
+      append-to-body
+      :close-on-click-modal="false"
+    >
+      <div class="userAgree">
+        <el-form
+          ref="form"
+          :model="form1"
+          :rules="rules"
+          label-width="100px"
+          :inline="true"
+        >
+        <div class="jiben">基本信息</div>
+           <el-form-item label="教育议题" prop="talkTheme">
+            <el-input
+              v-model="form1.talkTheme"
+              disabled
+              placeholder="请输入内容"
+            />
+          </el-form-item>
+          <el-form-item label="开始时间" prop="startTime">
+            <el-date-picker
+              editable
+              clearable
+              size="small"
+              v-model="form1.startTime"
+              type="date"
+              value-format="yyyy-MM-dd"
+              placeholder="选择开始时间"
+            >
+            </el-date-picker>
+          </el-form-item>
+          <el-form-item
+            label="结束时间"
+            prop="endTime"
+            label-width="115px"
+         
+          >
+            <el-date-picker
+              editable
+              clearable
+              size="small"
+              v-model="form1.endTime"
+              type="date"
+              value-format="yyyy-MM-dd"
+              placeholder="选择结束时间"
+            >
+            </el-date-picker>
+          </el-form-item>
+          <el-form-item label="组织人" prop="createName">
+             <el-select
+             disabled
+             filterable
+              v-model="form1.createName"
+              ref="createName"
+              placeholder="请选择组织人"
+            >
+              <el-option
+                v-for="item in executor"
+                :key="item.id"
+                :label="item.name"
+                :value="item.name"
+                @click.native="zuzhiPeople(item.id)"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="记录人" prop="recorder">
+             <el-select
+             disabled
+              v-model="form1.recorder"
+              ref="recorder"
+              placeholder="请选择记录人"
+              filterable
+              
+            >
+              <el-option
+                v-for="item in recodeexecutor"
+                :key="item.id"
+                :label="item.name"
+                :value="item.name"
+                 @click.native="jiluPeople(item.id)"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="参加人" prop="talkPeople" label-width="100px">
+            <el-select
+            disabled
+              v-model="form1.talkPeople"
+              ref="peoplenames"
+              placeholder="请选择参加人"
+              class="canjiaren"
+              multiple
+              filterable
+            >
+              <el-option
+                v-for="item in executor"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"
+                @click.native="returnExecutor(item.id, item.name)"
+              />
+            </el-select>
+          </el-form-item>
+          <div class="jiben">教育议题简介</div>
+          <el-form-item prop="talkIntroduction">
+            <el-input
+            disabled
+              v-model="form1.talkIntroduction"
+              type="textarea"
+              placeholder="请输入内容"
+            />
+          </el-form-item>
+          <div class="jiben">教育内容</div>
+          <el-form-item>
+            <quill-editor
+            disabled
+              class="quill-editor"
+              ref="myTextEditor"
+              v-model="form1.talkContent"
+              style="
+                height: 150px;
+                width: 1010px;
+                margin-left: 0px;
+                color: white;
+                margin-bottom: 60px;
+              "
+            ></quill-editor>
+          </el-form-item>
+          <div class="jiben">附件</div>
+           <el-form-item>
+          <!-- <FileUpload v-model="form1.fileName" /> -->
+          <span class="filename">{{form1.fileName}}</span>
+           <a
+            :href="form1.filePath"
+            download
+            title="下载"
+            style="color: white; margin-left: 10px"
+            class="downloadfile"
+            >下载附件</a
+          >
+           </el-form-item>
+        </el-form>
+      </div>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="open1=false">确 定</el-button>
+        <el-button @click="open1=false" size="btn">取 消</el-button>
+      </div>
+    </el-dialog>
     </div>
   </div>
 </template>
@@ -581,7 +746,10 @@ export default {
       },
       // 搜索时间的保存
       timeDate: "",
-      rylist:[]
+      rylist:[],
+       form1:{},
+      open1:false,
+      title1:""
     };
   },
   components: {
@@ -748,6 +916,18 @@ export default {
         this.title = "修改教育准备会";
       });
     },
+    // 查看按钮操作
+    handlelook(row){
+      console.log(row)
+      this.reset();
+      const id = row.id || this.ids
+       getGetready(id).then(response => {
+        this.form1 = response.data;
+         this.form1.talkPeople = this.form1.talkPeople.split(",").map(Number);
+        this.open1 = true;
+        this.title1 = "查看党委议教会";
+      });
+    },
     /** 提交按钮 */
     submitForm() {
       if(this.form.fileName){
@@ -807,6 +987,40 @@ export default {
 };
 </script>
 <style scoped>
+/* 备注 */
+.thistext {
+  color: white;
+  width: 900px;
+  border: 1px solid #fff;
+  border-radius: 4px;
+  height: auto;
+  min-height: 30px;
+  text-indent: 1em;
+  padding:2px;
+  line-height: 30px;
+  margin-bottom: 20px;
+  /* margin: auto; */
+}
+/* 附件名称样式 */
+.filename{
+  display: inline-block;
+  color: white;
+  width: 900px;
+  height: 30px;
+  border: 1px solid white;
+  line-height: 30px;
+  text-indent: 1em;
+}
+/* 下载按钮 */
+.downloadfile {
+  border: 1px solid white;
+  display: inline-block;
+  width: 100px;
+  height: 33px;
+  border-radius: 5px;
+  line-height: 33px;
+  text-align: center;
+}
 ::v-deep .el-pagination__sizes .el-input__suffix{
   right: 6px;
 }

src/views/thought/talk/index.vue

@@ -274,12 +274,12 @@
         <!-- <el-table-column label="创建人姓名" align="center" prop="createName" /> -->
         <!-- <el-table-column label="创建人id" align="center" prop="createId" /> -->
         <!-- <el-table-column label="文件路径" align="center" prop="filePath" /> -->
-        <el-table-column
+        <!-- <el-table-column
           label="文件名称"
           align="center"
           prop="fileName"
           show-overflow-tooltip
-        />
+        /> -->
         <el-table-column
           label="谈话内容"
           align="center"
@@ -307,9 +307,16 @@
           label="操作"
           align="center"
           class-name="small-padding fixed-width"
-          width="150px"
+          width="200px"
         >
           <template slot-scope="scope">
+            <el-button
+              size="btk"
+              type="text"
+              @click="handlelook(scope.row)"
+              v-hasPermi="['thought:talk:edit']"
+              >查看</el-button
+            >
             <el-button
               size="btu"
               type="text"
@@ -379,7 +386,6 @@
             />
           </el-form-item>
           <el-form-item label="谈心对象" prop="talkObject">
-            <!-- <el-input v-model="form.talkObject" placeholder="请输入谈心对象" /> -->
             <el-select
               filterable
               v-model="form.talkObject"
@@ -417,59 +423,120 @@
             >
             </el-date-picker>
           </el-form-item>
-          <!-- <el-form-item label="记录人" prop="recorder">
-            <el-input v-model="form.recorder" placeholder="请输入记录人" />
-          </el-form-item> -->
-
-          <!-- <el-form-item label="单位id" prop="unitId">
-          <el-input v-model="form.unitId" placeholder="请输入单位id" />
-        </el-form-item> -->
-
-          <!-- <el-form-item label="谈心对象id" prop="talkObjectId">
-          <el-input v-model="form.talkObjectId" placeholder="请输入谈心对象id" />
-        </el-form-item> -->
-
-          <!-- <el-form-item label="创建人姓名" prop="createName">
-            <el-input
-              v-model="form.createName"
-              placeholder="请输入创建人姓名"
+          <div class="jiben">谈话内容</div>
+          <el-form-item>
+            <quill-editor
+              class="quill-editor"
+              ref="myTextEditor"
+              v-model="form.talkContent"
+              style="
+                height: 150px;
+                width: 1040px;
+                margin-left: 0px;
+                color: white;
+                margin-bottom: 60px;
+              "
+            ></quill-editor>
+          </el-form-item>
+          <div class="jiben">附件</div>
+          <el-form-item>
+            <FileUpload v-model="form.fileName" />
+          </el-form-item>
+        </el-form>
+        <div slot="footer" class="dialog-footer">
+          <el-button type="primary" @click="submitForm">确 定</el-button>
+          <el-button @click="cancel" size="btn">取 消</el-button>
+        </div>
+      </el-dialog>
+      <!-- 查看谈心记录卡 -->
+      <el-dialog
+        :title="title1"
+        :visible.sync="open1"
+        width="1120px"
+        append-to-body
+        :close-on-click-modal="false"
+      >
+        <el-form
+          ref="form1"
+          :model="form1"
+          :rules="rules"
+          label-width="110px"
+          :inline="true"
+        >
+          <el-form-item label="谈心人员" prop="talkPeople">
+            <!-- <el-input v-model="form.talkPeople" placeholder="请输入谈心人员" /> -->
+            <el-select
+              filterable
+              disabled
+              v-model="form1.talkPeople"
+              ref="createName"
+              placeholder="请选择谈心人员"
+            >
+              <el-option
+                v-for="item in executors"
+                :key="item.id"
+                :label="item.name"
+                :value="item.name"
+                @click.native="zuzhiPeople(item.id)"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="谈心对象单位" prop="unitId">
+            <!-- <el-input v-model="form.unitName" placeholder="请输入单位名称" /> -->
+            <treeselect
+              disabled
+              v-model="form1.unitId"
+              :options="users"
+              placeholder="请选择单位"
+              class="threeselects"
+              @select="selectPeo"
             />
-          </el-form-item> -->
-          <!-- <el-form-item label="创建人id" prop="createId">
-          <el-input v-model="form.createId" placeholder="请输入创建人id" />
-        </el-form-item> -->
-          <!-- <el-form-item label="文件路径" prop="filePath">
-            <el-input v-model="form.filePath" placeholder="请输入文件路径" />
           </el-form-item>
-          <el-form-item label="文件名称" prop="fileName">
-            <el-input v-model="form.fileName" placeholder="请输入文件名称" />
+          <el-form-item label="谈心对象" prop="talkObject">
+            <el-select
+            disabled
+              filterable
+              v-model="form1.talkObject"
+              placeholder="请选择谈心对象"
+              ref="peoplenames"
+            >
+              <el-option
+                v-for="item in tanxinexecutor"
+                :key="item.id"
+                :label="item.name"
+                :value="item.name"
+                @click.native="peopleIds(item)"
+              />
+            </el-select>
           </el-form-item>
-
-          <el-form-item label="谈话时间" prop="talkTime">
+          <el-form-item label="谈心开始时间" prop="startTime">
             <el-date-picker
               clearable
               size="small"
-              v-model="form.talkTime"
+              v-model="form1.startTime"
               type="date"
               value-format="yyyy-MM-dd"
-              placeholder="选择谈话时间"
+              placeholder="选择开始时间"
             >
             </el-date-picker>
-          </el-form-item> -->
-          <!-- <el-form-item label="谈话地点" prop="talkAddress" label-width="115px">
-            <el-input v-model="form.talkAddress" placeholder="请输入谈话地点" />
-          </el-form-item> -->
-
-          <!-- <el-form-item label="记录人id" prop="recorderId">
-          <el-input v-model="form.recorderId" placeholder="请输入记录人id" />
-        </el-form-item> -->
+          </el-form-item>
+          <el-form-item label="谈心结束时间" prop="endTime" label-width="125px">
+            <el-date-picker
+              clearable
+              size="small"
+              v-model="form1.endTime"
+              type="date"
+              value-format="yyyy-MM-dd"
+              placeholder="选择结束时间"
+            >
+            </el-date-picker>
+          </el-form-item>
           <div class="jiben">谈话内容</div>
           <el-form-item>
-            <!-- <editor v-model="form.talkContent" :min-height="192"/> -->
             <quill-editor
               class="quill-editor"
               ref="myTextEditor"
-              v-model="form.talkContent"
+              v-model="form1.talkContent"
               style="
                 height: 150px;
                 width: 1040px;
@@ -480,13 +547,22 @@
             ></quill-editor>
           </el-form-item>
           <div class="jiben">附件</div>
-          <el-form-item>
-            <FileUpload v-model="form.fileName" />
+          <!-- <el-form-item> -->
+             <el-form-item>
+            <span class="filename">{{form1.fileName}}</span>
+          <a
+            :href="form1.filePath"
+            download
+            title="下载"
+            style="color: white; margin-left: 10px"
+            class="downloadfile"
+            >下载附件</a
+          >
           </el-form-item>
         </el-form>
         <div slot="footer" class="dialog-footer">
-          <el-button type="primary" @click="submitForm">确 定</el-button>
-          <el-button @click="cancel" size="btn">取 消</el-button>
+          <el-button type="primary" @click="open1=false">确 定</el-button>
+          <el-button @click="open1=false" size="btn">取 消</el-button>
         </div>
       </el-dialog>
     </div>
@@ -602,6 +678,9 @@ export default {
       unitName: "",
       // 获取单位列表
       getdeptList: [],
+      form1:{},
+      open1:false,
+      title1:""
     };
   },
   created() {
@@ -618,6 +697,7 @@ export default {
     });
   },
   methods: {
+    
     unit2Format(row) {
       var deptName = "";
       this.getdeptList.map((item) => {
@@ -782,6 +862,17 @@ export default {
         this.title = "修改谈心记录卡";
       });
     },
+    // 查看按钮操作
+    handlelook(row){
+      console.log(row)
+      this.reset();
+      const id = row.id || this.ids
+       getTalk(id).then(response => {
+        this.form1 = response.data;
+        this.open1 = true;
+        this.title1 = "查看谈心记录卡";
+      });
+    },
     /** 提交按钮 */
     submitForm() {
       if (this.form.fileName) {
@@ -841,6 +932,40 @@ export default {
 };
 </script>
 <style scoped>
+/* 备注 */
+.thistext {
+  color: white;
+  width: 900px;
+  border: 1px solid #fff;
+  border-radius: 4px;
+  height: auto;
+  min-height: 30px;
+  text-indent: 1em;
+  padding:2px;
+  line-height: 30px;
+  margin-bottom: 20px;
+  /* margin: auto; */
+}
+/* 附件名称样式 */
+.filename{
+  display: inline-block;
+  color: white;
+  width: 930px;
+  height: 30px;
+  border: 1px solid white;
+  line-height: 30px;
+  text-indent: 1em;
+}
+/* 下载按钮 */
+.downloadfile {
+  border: 1px solid white;
+  display: inline-block;
+  width: 100px;
+  height: 33px;
+  border-radius: 5px;
+  line-height: 33px;
+  text-align: center;
+}
 ::v-deep .el-pagination__sizes .el-input__suffix{
   right: 6px;
 }

src/views/thought/teacher/index.vue

@@ -513,7 +513,6 @@ export default {
         this.level -= 1;
       }
       // this.loading=true
-      console.log(this.parentId);
       if (this.level == 1) {
         listTeachers({
           level: this.level,
@@ -521,7 +520,6 @@ export default {
           pageSize: this.queryParams.pageSize,
           
         }).then((res) => {
-          console.log(res);
           this.teacherList = res.rows;
           // console.log(res.rows)
           this.fatherparentId=res.rows[0].parentId
@@ -557,7 +555,7 @@ export default {
       this.parentIdss = row.id;
       this.fatherparentId=row.id
       this.open2 = true;
-      this.title2 = "请输入子分类名称";
+      this.title2 = "添加子分类";
     },
     /** 查询教案库设置列表 */
     getList() {
@@ -630,7 +628,7 @@ export default {
     handleAdd() {
       this.reset();
       this.open = true;
-      this.title = "添加教案库设置";
+      this.title = "添加目录";
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
@@ -689,9 +687,7 @@ export default {
     },
     /** 删除按钮操作 */
     handleDelete(row) {
-      // console.log(this.parentIdss)
-      console.log(this.fatherparentId)
-      // console.log(row.parentId);
+      console.log(row)
       const ids = row.id || this.ids;
       this.$modal
         .confirm("是否确认删除？")
@@ -703,6 +699,12 @@ export default {
             row.parentDirectory=null
           }
           console.log(this.level)
+          if(row.pageX){
+            row.parentId=0
+            row.parentDirectory=""
+            row.level=1
+            this.level=1
+          }
           listTeacher({
             parentDirectory: row.parentDirectory,
             level: row.level,
@@ -869,93 +871,7 @@ export default {
   text-align: center;
   margin-top: 2px;
 }
-/* ::v-deep .data .el-input__suffix {
-  position: absolute;
-  right: 281px;
-} */
-/* .app-container {
-  display: flex;
-} */
-/* .app-container .box-lfet .data {
-  height: 40px;
-  background: #003156;
-  margin-bottom: 12px;
-  color: #fff;
-  display: flex;
-  font-size: 13px;
-  line-height: 25px;
-  position: relative;
-} */
-/* 
-.box-lfet .data p {
-  position: absolute;
-  top: -5px;
-  left: 15px;
-}
-.box-lfet .data .a1 {
-  width: 128px;
-  height: 26px;
-  background: rgba(23, 74, 112, 0.4);
-  border-radius: 13px;
-  position: absolute;
-  top: 7px;
-  left: 60px;
-} */
-/* ::v-deep .data .el-date-editor.el-input {
-  width: 100%;
-  border: none;
-}
-::v-deep .data .el-input__inner {
-  width: 100% !important;
-  border: none;
-}
-::v-deep .data .el-input--medium .el-input__icon {
-  line-height: 36px;
-  position: absolute;
-  right: -223px;
-  top: 2px;
-}
-::v-deep .data .el-input__inner {
-  background-color: transparent;
-  color: #fff;
-  text-align: center;
-  margin-top: 2px;
-}
-::v-deep .data .el-input__suffix {
-  position: absolute;
-  right: 281px;
-} */
-/* 头部样式 */
 
-/* 左侧树状盒子 */
-.app-container .box-lfet {
-  width: 15%;
-  min-height: 740px;
-  /* background: #003156; */
-  /* padding: 10px; */
-  margin-right: 10px;
-  /* border: 1px solid white; */
-}
-/* 右侧内容盒子 */
-.app-container .box-right {
-  flex: 1;
-}
-.app-container .box-lfet .data {
-  height: 40px;
-  background: #003156;
-  margin-bottom: 12px;
-  color: #fff;
-  display: flex;
-  font-size: 13px;
-  line-height: 25px;
-  position: relative;
-}
-.el-tree {
-  background: #003156;
-  color: #fff;
-  margin-right: 2px;
-  padding-top: 7px;
-}
 ::v-deep .el-dialog {
   background-color: #004d86 !important;
 }

src/views/thought/teacherFile/index.vue

@@ -198,7 +198,7 @@
                   style="
                     margin-right: 5px;
                     position: absolute;
-                    left: 20px;
+                    left: 10px;
                     top: 2px;
                   "
                 />
@@ -210,7 +210,7 @@
                   style="
                     margin-right: 5px;
                     position: absolute;
-                    left: 25px;
+                    left: 10px;
                     top: 2px;
                   "
                 />
@@ -265,23 +265,23 @@
             style="margin-left: 50px"
           >
             <el-form-item
-              label-width="100px"
+              label-width="40px"
               prop="directory"
               class="change_plan_type"
+              label="目录"
             >
               <treeselect
-                v-model="form.directory"
+                v-model="form.directoryName"
                 :options="users"
                 :value="11"
                 class="threeselects"
                 @select="selectPeo1"
                 placeholder="请选择目录"
               >
-              <div slot="value-label" slot-scope="{ node }">{{ node.raw.directory }}</div>
-                <label
-                  slot="option-label"
-                  slot-scope="{node}"
-                >
+                <div slot="value-label" slot-scope="{ node }">
+                  {{ node.raw.directory }}
+                </div>
+                <label slot="option-label" slot-scope="{ node }">
                   {{ node.raw.directory }}
                 </label>
               </treeselect>
@@ -300,10 +300,19 @@
       <div class="Ranking">
         <div class="jichu">排行</div>
         <table style="color: white">
+          <thead>
+            <!-- <tr style="font-size:14px;height:25px">
+              <th>序号</th>
+              <th>分类</th>
+              <th>文件</th>
+              <th>阅读量</th>
+            </tr> -->
+          </thead>
+          <tbody>
           <tr
             class="borderBottom"
             v-for="(item, index) in Ranking"
-            :key="item.directory_id"
+            :key="item.id"
           >
             <!-- 作战类 documentCategory -->
             <!-- 上月阅读量 readnumber1 -->
@@ -311,22 +320,24 @@
             <!-- 排序 -->
             <td class="numbers">{{ index + 1 }}</td>
             <!-- 作战类类别 -->
-            <td class="find">{{ item.documentCategory }}</td>
-            <!-- 上周阅读量 -->
-            <td class="readnumber">
-              上月阅读量
-              <span style="margin-left: 5px">{{ item.readnumber2 }}</span>
-            </td>
-            <!-- 本周阅读量 -->
+            <td class="find">{{ item.directoryName }}</td>
+            <!-- 文件名 -->
             <td class="thisweek" style="position: relative">
               <!-- <img src="../../../images/upRow.png" alt="" style="position:absolute;top:18px;right:158px" > -->
               <!-- <img src="../../../images/downRow.png" alt=""  style="position:absolute;top:17px;right:158px"> -->
-              本月阅读量
-              <span style="color: red; margin-left: 5px">{{
-                item.readnumber1
+            
+              <span style="margin-left: 5px">{{
+                item.fileName
               }}</span>
             </td>
+            <!-- 阅读量 -->
+            <td class="readnumber">
+              阅读量
+              <span style="margin-left: 5px;" :class="index<3?'green':'red'">{{ item.readVolume }}</span>
+            </td>
+            
           </tr>
+          </tbody>
         </table>
       </div>
       <!-- 添加预览doc文件弹框 -->
@@ -445,10 +456,7 @@ window.JSZip = require("jszip");
 //   // 获取排行接口
 //   rankList,
 // } from "@/api/regulations/fileinfo";
-import {
-  listTeacher,
-  listTeachers,
-} from "@/api/thought/teacher";
+import { listTeacher, listTeachers } from "@/api/thought/teacher";
 import {
   listTeacherFile,
   getTeacherFile,
@@ -457,6 +465,8 @@ import {
   updateTeacherFile,
   exportTeacherFile,
   listmulu,
+  listread,
+  rankList
 } from "@/api/thought/teacherFile";
 import {
   // 查询目录列表接口
@@ -605,25 +615,26 @@ export default {
       // 父目录id
       fatherparentId: "",
       users: [],
-      
-      dir:""
+
+      dir: "",
     };
   },
   created() {
     // 获取执行单位列表
-    listmulu({parentId:0}).then((res) => {
+    listmulu({ parentId: 0 }).then((res) => {
       // console.log(res,2)
-     
+
       this.users = res.rows;
-      console.log(this.users)
+      console.log(this.users);
     });
-    
+
     this.getList();
     // 获取目录接口
     this.ListDirectoryinfo();
     // 获取排行目录接口
     // rankList().then((res) => {
     //   this.Ranking = res.data;
+    //   console.log(this.RankList)
     // });
     this.RankList();
     $(".app-wrapper").addClass("openSidebar");
@@ -636,10 +647,10 @@ export default {
     Treeselect,
   },
   methods: {
-    selectPeo1(row){
-      this.dir=row.directory
-      this.form.directoryId=row.id
-      console.log(this.dir)
+    selectPeo1(row) {
+      this.dir = row.directory;
+      this.form.directoryId = row.id;
+      console.log(this.dir);
     },
     /**
      * 预览PDF
@@ -694,6 +705,7 @@ export default {
     RankList() {
       rankList().then((res) => {
         this.Ranking = res.data;
+        console.log(this.Ranking)
       });
     },
     handleSizeChange(val) {},
@@ -770,9 +782,8 @@ export default {
         })
         .then(() => {
           this.ListDirectoryinfo();
-          this.RankList();
           this.getList();
-
+          this.RankList();
           this.$modal.msgSuccess("删除成功");
         })
         .catch(() => {});
@@ -786,7 +797,8 @@ export default {
       this.loading = true;
       this.queryParams1.parentId = 0;
       if (this.level != 1) {
-        listTeacher({
+
+        listTeacher({ 
           parentDirectory: this.parentDirectory,
           level: this.level,
           pageNum: this.queryParams1.pageNum,
@@ -799,7 +811,6 @@ export default {
       } else {
         listTeacher(this.queryParams1).then((response) => {
           this.teacherList = response.rows;
-          console.log(this.teacherList);
           this.total1 = response.total;
           this.loading = false;
         });
@@ -808,7 +819,7 @@ export default {
     // 点击目录
     mulus(row) {
       this.parentId = row.id;
-      console.log(row.id)
+      console.log(row.id);
       this.parentDirectory = row.parentDirectory;
       this.subclassification = row.subclassification;
       // 文件
@@ -817,7 +828,7 @@ export default {
         pageNum: this.queryParams.pageNum,
         pageSize: this.queryParams.pageSize,
       }).then((res) => {
-        console.log(res)
+        console.log(res);
         this.fileinfoList = res.rows;
         this.total = res.total;
       });
@@ -845,7 +856,6 @@ export default {
     },
     // 返回上级
     turnback(row) {
-     
       if (this.level == 1) {
         this.level == 1;
         return;
@@ -959,8 +969,9 @@ export default {
     },
     /** 上传文件提交按钮 */
     submitForm() {
-      this.form.directory=this.dir
-      console.log(this.form);
+      this.form.directoryName = this.dir;
+      // console.log(this.form);
+      console.log(this.form.directoryName);
       this.$refs["form"].validate((valid) => {
         if (valid) {
           // console.log(this.form.file[0]);
@@ -974,16 +985,14 @@ export default {
           this.form.theNumberPages = this.form.file[0].pageCount;
           // 文件大小
           this.form.fileSize = this.form.file[0].fileLength;
-          // 目录名称
-          this.form.directoryName = this.form.subclassification;
           //输出结果
-          console.log(this.form);
           // 上传文件接口
           addTeacherFile(this.form).then((response) => {
             // this.ListDirectoryinfo();
             this.$modal.msgSuccess("上传成功");
             this.open = false;
             this.getList();
+            this.RankList()
           });
         }
       });
@@ -998,11 +1007,17 @@ export default {
         .confirm("是否确认删除该文件？")
         .then(function () {
           return delDirectoryinfo(ids);
+        }).then(()=>{
+           this.getList()
         })
         .then(() => {
-          // this.parentId=""
-          this.getList();
-          // this.ListDirectoryinfo();
+         
+          // this.loading = true;
+          // listTeacherFile(this.queryParams).then((response) => {
+          //   this.fileinfoList = response.rows;
+          //   this.total = response.total;
+          //   this.loading = false;
+          // });
           listDirectoryinfo({
             parentId: this.parentId,
             pageNum: this.queryParams1.pageNum,
@@ -1029,6 +1044,7 @@ export default {
               this.$modal.msgSuccess("删除成功");
             }
           });
+          this.getList();
         })
         .catch(() => {});
     },
@@ -1093,11 +1109,12 @@ export default {
           docx.renderAsync(data, this.$refs.file); // 渲染到页面预览
         });
       } else if (row.parentDirId == ".pdf") {
+        this.pageNum=1
         this.previewDialog = true;
         this.pdfurl = process.env.VUE_APP_BASE_API + row.parentDirName;
       }
-      row.common = "1";
-      updateFileinfo(row).then((res) => {
+      listread(row).then((res) => {
+        console.log(res)
         this.getList();
         rankList().then((res) => {
           this.Ranking = res.data;
@@ -1130,7 +1147,15 @@ export default {
   padding: 0 !important;
   background: none !important;
 }
-
+.red{
+  color: #FF4949;
+}
+.green{
+  color: #13CE66;
+}
+::v-deep .upload-file-list .el-upload-list__item{
+  margin-left: -30px !important;
+}
 ::v-deep .vue-treeselect__placeholder {
   color: #bdbdbd4f !important;
 }
@@ -1615,7 +1640,7 @@ body,
   margin-right: 22px;
   /* color: white; */
 }
-::v-deep .vue-treeselect__single-value{
+::v-deep .vue-treeselect__single-value {
   color: white;
 }
 </style>

src/views/thought/weekjob/index.vue

@@ -291,38 +291,21 @@
           prop="politicalOfficer"
           show-overflow-tooltip
         />
-        <!-- <el-table-column
-          label="创建时间"
-          align="center"
-          prop="creatTime"
-          width="100"
-        >
-          <template slot-scope="scope">
-            <span>{{ parseTime(scope.row.creatTime, "{y}-{m}-{d}") }}</span>
-          </template>
-        </el-table-column> -->
-        <!-- <el-table-column label="创建人姓名" align="center" prop="creatName" /> -->
-        <!-- <el-table-column label="创建人id" align="center" prop="creatId" /> -->
-        <!-- <el-table-column
-          label="备注"
-          align="center"
-          prop="remark"
-          show-overflow-tooltip
-        /> -->
-
-        <!-- <el-table-column label="单位id" align="center" prop="unitId" /> -->
-
-        <!-- <el-table-column label="值班领导id" align="center" prop="dutyLeaderId" /> -->
-
-        <!-- <el-table-column label="政治长官id" align="center" prop="politicalOfficerId" /> -->
 
         <el-table-column
           label="操作"
           align="center"
           class-name="small-padding fixed-width"
-          label-width="180px"
+          width="200px"
         >
           <template slot-scope="scope">
+            <el-button
+              size="btk"
+              type="text"
+              @click="handlelook(scope.row)"
+              v-hasPermi="['thought:weekjob:edit']"
+              >查看</el-button
+            >
             <el-button
               size="btu"
               type="text"
@@ -330,6 +313,7 @@
               v-hasPermi="['thought:weekjob:edit']"
               >修改</el-button
             >
+            
             <el-button
               size="btd"
               type="text"
@@ -569,6 +553,187 @@
           <el-button @click="cancel" size="btn">取 消</el-button>
         </div>
       </el-dialog>
+      <!-- 查看按钮操作 -->
+       <!-- 查看周工作对话框 -->
+      <el-dialog
+        :title="title1"
+        :visible.sync="open1"
+        width="1100px"
+        append-to-body
+        :close-on-click-modal="false"
+      >
+        <div class="userAgree">
+          <el-form
+            ref="form"
+            :model="form1"
+            :rules="rules"
+            label-width="100px"
+            :inline="true"
+          >
+            <div class="jiben">基本信息</div>
+            <el-form-item label="单位" prop="unitId">
+              <treeselect
+                disabled
+                v-model="form1.unitId"
+                :options="users"
+                placeholder="请选择到访单位"
+                class="threeselects"
+                @select="selectPeo"
+              >
+              </treeselect>
+              <!-- </el-form-item> -->
+            </el-form-item>
+            <el-form-item label="连值班领导" prop="dutyLeader">
+              <el-select
+              disabled
+                filterable
+                v-model="form1.dutyLeader"
+                placeholder="请选择人员"
+                ref="peoplenames"
+              >
+                <el-option
+                  v-for="item in executor"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.name"
+                  @click.native="peopleIds(item)"
+                />
+              </el-select>
+            </el-form-item>
+            <el-form-item label="电话" prop="phone">
+              <el-input v-model="form1.phone" placeholder="请输入电话" disabled />
+            </el-form-item>
+            <el-form-item label="军事长官 " prop="militaryOfficer">
+              <el-select
+              disabled
+                filterable
+                v-model="form1.militaryOfficer"
+                ref="militaryOfficer"
+                placeholder="请选择军事长官"
+              >
+                <el-option
+                  v-for="item in junshiexecutor"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.name"
+                  @click.native="zuzhiPeople(item.id)"
+                />
+              </el-select>
+            </el-form-item>
+            <el-form-item label="政治长官" prop="politicalOfficer">
+              <el-select
+              disabled
+                filterable
+                v-model="form1.politicalOfficer"
+                ref="militaryOfficer"
+                placeholder="请选择军事长官"
+              >
+                <el-option
+                  v-for="item in zhengzhiexecutor"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.name"
+                  @click.native="jiluPeople(item.id)"
+                />
+              </el-select>
+            </el-form-item>
+            <el-form-item label="工作标题" prop="jobTitle">
+              <el-input v-model="form1.jobTitle" placeholder="请输入工作标题" disabled/>
+            </el-form-item>
+            <el-form-item label="开始时间" prop="startTime">
+              <el-date-picker
+              disabled
+                editable
+                clearable
+                size="small"
+                v-model="form1.startTime"
+                type="date"
+                value-format="yyyy-MM-dd"
+                placeholder="选择开始时间"
+              >
+              </el-date-picker>
+            </el-form-item>
+            <el-form-item label="结束时间" prop="endTime" label-width="115px">
+              <el-date-picker
+              disabled
+                editable
+                clearable
+                size="small"
+                v-model="form1.endTime"
+                type="date"
+                value-format="yyyy-MM-dd"
+                placeholder="选择结束时间"
+              >
+              </el-date-picker>
+            </el-form-item>
+            <div class="jiben">工作登记</div>
+            <div class="box3" v-for="(item, i) in tomList" :key="i">
+              <el-form
+                ref="refform"
+                :model="form1"
+                :rules="rules"
+                label-width="80px"
+                :inline="true"
+              >
+                <el-form-item label="" prop="daytime">
+                  <el-date-picker
+                  disabled
+                    v-model="item.time"
+                    type="date"
+                    value-format="yyyy-MM-dd"
+                    placeholder="选择时间"
+                    @change="
+                      (val) => {
+                        change_time(val, i);
+                      }
+                    "
+                  >
+                  </el-date-picker>
+                </el-form-item>
+                <el-form-item label="" prop="week">
+                  <el-input placeholder="星期" v-model="item.week" disabled />
+                </el-form-item>
+                <el-form-item>
+                  <el-button
+                    type="primary"
+                    icon="el-icon-plus"
+                    size="mini"
+                    style="padding: 11px 10px 10px 10px"
+                    @click="addForms"
+                    v-if="i == tomList.length - 1"
+                  ></el-button>
+                  <el-button
+                    type="danger"
+                    icon="el-icon-close"
+                    size="mini"
+                    style="padding: 11px 10px 10px 10px"
+                    v-if="i > 0"
+                    @click="delForms(i)"
+                  ></el-button>
+                </el-form-item>
+                <el-form-item label="" prop="">
+                  <quill-editor
+                    class="quill-editor"
+                    ref="myTextEditor"
+                    v-model="item.contents"
+                    style="
+                      height: 150px;
+                      width: 1010px;
+                      margin-left: 0px;
+                      color: white;
+                      margin-bottom: 60px;
+                    "
+                  ></quill-editor>
+                </el-form-item>
+              </el-form>
+            </div>
+          </el-form>
+        </div>
+        <div slot="footer" class="dialog-footer">
+          <el-button type="primary" @click="open1=false">确 定</el-button>
+          <el-button @click="open1=false" size="btn">取 消</el-button>
+        </div>
+      </el-dialog>
     </div>
   </div>
 </template>
@@ -733,6 +898,9 @@ export default {
       ],
       getdeptList: [],
       zhankai: false,
+      form1:{},
+      open1:false,
+      title1:""
     };
   },
   created() {
@@ -956,6 +1124,17 @@ export default {
         this.title = "修改周工作";
       });
     },
+    handlelook(row){
+      console.log(row)
+      this.reset();
+      const id = row.id || this.ids
+       getWeekjob(id).then(response => {
+        this.form1 = response.data;
+        this.tomList = this.form1.thoughtWeekjobFuList;
+        this.open1 = true;
+        this.title1 = "查看周工作";
+      });
+    },
     /** 提交按钮 */
     submitForm() {
       this.form.unitName = this.form.unitId;
@@ -1015,6 +1194,41 @@ export default {
 };
 </script>
 <style scoped>
+/* 备注 */
+.thistext {
+  color: white;
+  width: 1010px;
+  border: 1px solid #fff;
+  border-radius: 4px;
+  height: auto;
+  min-height: 35px;
+  text-indent: 1em;
+  padding:2px;
+  line-height: 35px;
+  margin-bottom: 20px;
+  /* margin: auto; */
+}
+/* 附件名称样式 */
+.filename{
+  display: inline-block;
+  color: white;
+  width: 900px;
+  height: 30px;
+  border: 1px solid white;
+  line-height: 30px;
+  text-indent: 1em;
+}
+/* 下载按钮 */
+.downloadfile {
+  border: 1px solid white;
+  display: inline-block;
+  width: 100px;
+  height: 33px;
+  border-radius: 5px;
+  line-height: 33px;
+  text-align: center;
+}
+
 .zhankai {
   margin-top: -30px;
   width: 1015px;