完成了月统计计划修改删除，完成了月统计响应获取未响应数据列表

FeatureSuggester.xml

@@ -1,9 +0,0 @@
-<application>
-  <component name="FeatureSuggesterSettings">
-    <option name="workingDays">
-      <list>
-        <option value="1650436929708" />
-      </list>
-    </option>
-  </component>
-</application>

colors.scheme.xml

@@ -1,5 +0,0 @@
-<application>
-  <component name="EditorColorsManagerImpl">
-    <global_color_scheme name="Moonlight (Material)" />
-  </component>
-</application>

databaseDrivers.xml

@@ -1,3 +0,0 @@
-<application>
-  <component name="LocalDatabaseDriverManager" version="201" />
-</application>

debugger.xml

@@ -1,13 +0,0 @@
-<application>
-  <component name="XDebuggerSettings">
-    <data-views />
-    <general />
-    <debuggers>
-      <debugger id="javascript">
-        <configuration>
-          <custom-object-presentation />
-        </configuration>
-      </debugger>
-    </debuggers>
-  </component>
-</application>

editor-font.xml

@@ -1,7 +0,0 @@
-<application>
-  <component name="DefaultFont">
-    <option name="VERSION" value="1" />
-    <option name="FONT_REGULAR_SUB_FAMILY" value="Regular" />
-    <option name="FONT_BOLD_SUB_FAMILY" value="Bold" />
-  </component>
-</application>

editor.xml

@@ -1,6 +0,0 @@
-<application>
-  <component name="TodoConfiguration">
-    <pattern pattern="\btodo\b.*" />
-    <pattern pattern="\bfixme\b.*" />
-  </component>
-</application>

filetypes.xml

@@ -1,5 +0,0 @@
-<application>
-  <component name="FileTypeManager" version="18">
-    <ignoreFiles list="*$py.class;*.pyc;*.pyo;*.rbc;*.yarb;*~;.DS_Store;.git;.hg;.svn;CVS;__pycache__;_svn;vssver.scc;vssver2.scc" />
-  </component>
-</application>

find.xml

@@ -1,9 +0,0 @@
-<application>
-  <component name="FindSettings">
-    <mask>*.css</mask>
-    <mask>*.html</mask>
-    <mask>*.xml</mask>
-    <mask>*.pyw</mask>
-    <mask>*.py</mask>
-  </component>
-</application>

gitee.xml

@@ -1,7 +0,0 @@
-<application>
-  <component name="GiteeAccounts">
-    <account name="gxlove_max@163.com" id="4a9f814c-1ea6-4c45-9d45-23db22b57623">
-      <Server host="gitee.com" clientid="fc439d90cb2ffc20cffeb70a6a4039e69847485e0fa56cfa0d1bf006098e24dd" clientsecret="386f187646ee361049f69cd213424bdba5af03e820d10a68a68e5fb520902596" />
-    </account>
-  </component>
-</application>

ide.general.xml

@@ -1,6 +0,0 @@
-<application>
-  <component name="Registry">
-    <entry key="ide.balloon.shadow.size" value="0" />
-    <entry key="ide.experimental.ui" value="false" />
-  </component>
-</application>

laf.xml

@@ -1,5 +0,0 @@
-<application>
-  <component name="LafManager" autodetect="false">
-    <laf class-name="com.intellij.ide.ui.laf.darcula.DarculaLaf" themeId="MOONLIGHT" />
-  </component>
-</application>

material_theme.xml

@@ -1,9 +0,0 @@
-<application>
-  <component name="MaterialThemeConfig">
-    <option name="pristineConfig" value="false" />
-    <option name="accentColor" value="74a0f1" />
-    <option name="selectedTheme" value="MOONLIGHT" />
-    <option name="userId" value="1365161:1804546eb6b:-7fbc" />
-    <option name="version" value="7.3.2" />
-  </component>
-</application>

nodejs.xml

@@ -1,5 +0,0 @@
-<application>
-  <component name="NodeJsLocalInterpreterManager">
-    <local-interpreter path="D:/Development/node/node.exe" />
-  </component>
-</application>

shared-indexes.xml

@@ -1,7 +0,0 @@
-<application>
-  <component name="download-consent">
-    <option name="consentItems">
-      <item download="ALLOWED" kind="python" url="https://index-cdn.jetbrains.com/v2" />
-    </option>
-  </component>
-</application>

src/api/thought/responses.js

@@ -50,4 +50,12 @@ export function exportResponses(query) {
     method: 'get',
     params: query
   })
+}
+
+// 数据的展示
+export function Exhibition() {
+  return request({
+    url: '/thought/thoughtPlan/getnumber',
+    method: 'get',
+  })
 }

src/api/thought/thoughtPlan.js

@@ -85,3 +85,18 @@ export function getXiuGaiButton(id) {
     data: id
   })
 }
+
+// 响应按钮月教育计划
+export function getResponse(id) {
+  return request({
+    url: 'thought/thoughtPlan/getDetails' + id,
+    method: 'get'
+  })
+}
+// 修改按钮月教育计划
+export function getModify(id) {
+  return request({
+    url: 'thought/thoughtPlan/updatePlan' + id,
+    method: 'get'
+  })
+}

src/assets/styles/global.css

@@ -864,28 +864,6 @@ body #app .sidebar-container .theme-dark .nest-menu .el-submenu>.el-submenu__tit
   border-bottom: none;
 }
 
-/* 要事日记数据盒子的位置 */
-/* #dialoges .el-dialog {
-  width: 528px !important;
-  position: absolute;
-  right: -1300px;
-  top: 100px
-}
-#dialoges  .jiben {
-  width: 461px !important;
-  height: 32px;
-  background-image: url(/static/img/小标题底.b7c6f45a.png);
-  margin-bottom: 25px;
-  color: #fff;
-  padding-left: 16px;
-  line-height: 32px;
-}
-#dialoges .el-dialog__body{
-  margin: 11px 0px 21px 16px;
-  padding-top: 19px !important;
-  -webkit-box-sizing: border-box;
-  box-sizing: border-box;
-} */
 
 /* 门岗管理 */
 

src/views/militaryvehicleManagement/thebusAccessLog/index.vue

@@ -176,6 +176,7 @@
               :label="item.dictLabel"
               :value="item.dictValue"
               class="input_xiala"
+              @click.native="model(item)"
             >
             </el-option>
           </el-select>
@@ -338,6 +339,10 @@ export default {
     });
   },
   methods: {
+    // 车辆型号触发
+    model(val) {
+      console.log(val);
+    },
     // 重置人员
     ChongZhi() {
       this.form.driverId = null;

src/views/pt.vue

@@ -205,56 +205,56 @@
               <div class="demo-box">
                 <div
                   class="demo active"
-                  v-on:click="renlifun"
+                  v-on:click="zhinengfun"
                   data-url="/diary?ref=addtabs"
                 >
-                  <img src="../images/rl.png" alt />
+                  <img src="../assets/images/phone1.png" alt class="phone" />
                 </div>
               </div>
               <div class="demo-a">
-                <a href="#" class="a">人力资源</a>
+                <a href="#" class="a">智能手机柜</a>
               </div>
             </li>
             <li>
               <div class="demo-box">
                 <div
                   class="demo active"
-                  v-on:click="xitongfun"
+                  v-on:click="renlifun"
                   data-url="/diary?ref=addtabs"
                 >
-                  <img src="../images/xt.png" alt />
+                  <img src="../images/rl.png" alt />
                 </div>
               </div>
               <div class="demo-a">
-                <a href="#" class="a">系统管理</a>
+                <a href="#" class="a">人力资源</a>
               </div>
             </li>
             <li>
               <div class="demo-box">
                 <div
                   class="demo active"
-                  v-on:click="gongju"
+                  v-on:click="xitongfun"
                   data-url="/diary?ref=addtabs"
                 >
                   <img src="../images/xt.png" alt />
                 </div>
               </div>
               <div class="demo-a">
-                <a href="#" class="a">系统工具</a>
+                <a href="#" class="a">系统管理</a>
               </div>
             </li>
             <li>
               <div class="demo-box">
                 <div
                   class="demo active"
-                  v-on:click="zhinengfun"
+                  v-on:click="gongju"
                   data-url="/diary?ref=addtabs"
                 >
-                  <img src="../images/sx.png" alt />
+                  <img src="../images/xt.png" alt />
                 </div>
               </div>
               <div class="demo-a">
-                <a href="#" class="a">智能手机柜</a>
+                <a href="#" class="a">系统工具</a>
               </div>
             </li>
             <img src="../assets/images/椭圆 513 (2).png" class="li-img" alt />
@@ -1624,4 +1624,7 @@ hr {
   background-color: #409eff;
   margin-right: 10px;
 }
+.phone {
+  margin-top: 40px !important;
+}
 </style>

src/views/thought/responses/index.vue

@@ -131,8 +131,14 @@
           ></el-tree>
         </div>
       </el-col>
-      <el-col :span="1.5" class="mb8">
+      <el-col :span="2" class="mb8">
+        <div class="shuJu" @click="dengJI">
+          <!-- <span class="box44 public"> 当前数据为 : {{ time }}</span> -->
+          <span class="box5 public"> 已响应部门 : {{ yishenpi }}</span>
+          <span class="box6"> 未响应部门 : {{ weishenpi }}</span>
+        </div>
         <!-- <el-button
+          v-show="true"
           type="primary"
           plain
           icon="el-icon-plus"
@@ -219,7 +225,7 @@
               <span>{{ parseTime(scope.row.planEndTime, "{y}-{m}-{d}") }}</span>
             </template>
           </el-table-column>
-          <el-table-column label="计划个数" align="center" prop="planNumber" />
+          <!-- <el-table-column label="计划个数" align="center" prop="planNumber" /> -->
           <el-table-column
             label="需响应计划数"
             align="center"
@@ -235,10 +241,10 @@
               <span v-if="scope.row.state == '0'" style="color: #00eaff"
                 >未响应</span
               >
-              <span v-if="scope.row.state == '1'" style="color: #13ce66"
-                >已完成</span
+              <span v-if="scope.row.state == '1'" style="color: #ffba00"
+                >待审批</span
               >
-              <span v-if="scope.row.state == '2'" style="color: #ffba00"
+              <span v-if="scope.row.state == '2'" style="color: #13ce66"
                 >已审批</span
               >
               <span
@@ -561,6 +567,7 @@
               v-model="form.planIntroduction"
               placeholder="请输入计划简介"
               readonly
+              autosize
             />
           </el-form-item>
           <div class="jiben">计划条数</div>
@@ -590,6 +597,7 @@
                   v-model="item.planContent"
                   placeholder="请输入计划详情"
                   readonly
+                  autosize
                 />
               </el-form-item>
             </el-form>
@@ -615,6 +623,34 @@
           </el-form>
         </el-form>
       </div>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="cancel" size="btn">取消</el-button>
+      </div>
+    </el-dialog>
+
+    <!-- 数据查看弹出层 -->
+    <el-dialog
+      :visible.sync="dialogVisible"
+      title="统计详情"
+      append-to-body
+      id="dialoges"
+      :close-on-click-modal="false"
+    >
+      <div class="zuiDa">
+        <!-- <div class="shuJuTime">当前数据为 ： {{ time }}</div> -->
+        <div class="jiben">已响应部门:{{ yishenpi }}个</div>
+        <div class="boxxx">
+          <div v-for="(item, i) in cg" :key="i" class="greed">
+            <span class="greedss"> </span><span>{{ item }}</span>
+          </div>
+        </div>
+        <div class="jiben">未响应部门:{{ weishenpi }}个</div>
+        <div class="boxxx">
+          <div v-for="(item, i) in sb" :key="i" class="red">
+            <span class="greeds"> </span><span>{{ item }}</span>
+          </div>
+        </div>
+      </div>
     </el-dialog>
   </div>
 </template>
@@ -627,8 +663,10 @@ import {
   addResponses,
   updateResponses,
   exportResponses,
+  Exhibition,
 } from "@/api/thought/responses";
 import { getWeiShu } from "@/api/grassrootsregistration/bdglmeeting";
+import { exportBdgShuju } from "@/api/grassrootsregistration/bdgldiary";
 
 export default {
   name: "responses",
@@ -711,13 +749,61 @@ export default {
           { required: true, message: "请输入驳回原因", trigger: "blur" },
         ],
       },
+      // 数据时间的保存
+      tiems: "",
+      // 获取成功对象
+      cg: {},
+      // 获取失败对象
+      sb: {},
+      // 获取登记部门数量
+      yishenpi: null,
+      // 获取未登记数量
+      weishenpi: null,
+      // 数据查看的弹出层
+      dialogVisible: false,
+      //  右边登记数据
+      registrationData: {},
+      time: "",
     };
   },
   created() {
     this.getList();
     this.treeselect();
+    // 获取数据
+    this.getShuJu();
+    this.startTime();
   },
   methods: {
+    // 时间
+    startTime() {
+      var today = new Date();
+      var y = today.getFullYear();
+      var M = today.getMonth() + 1;
+      var d = today.getDate();
+      if (M < 10) {
+        M = "0" + M;
+      }
+      if (d < 10) {
+        d = "0" + d;
+      }
+      this.time = y + "-" + M + "-" + d;
+    },
+    // 点击数据盒子
+    dengJI() {
+      this.dialogVisible = true;
+    },
+    // 获取部门数据
+    getShuJu() {
+      Exhibition().then((res) => {
+        console.log(res, 1);
+        this.registrationData = res.data;
+        this.cg = res.data[0];
+        this.sb = res.data[1];
+        this.yishenpi = res.data[2];
+        this.weishenpi = res.data[3];
+        this.tiems = res.time;
+      });
+    },
     // 审批确定提交操作
     submitForm1() {
       if (this.form.id != null) {
@@ -791,7 +877,7 @@ export default {
     },
     // 取消按钮
     cancel() {
-      this.open = false;
+      this.open3 = false;
       this.reset();
     },
     // 表单重置
@@ -909,16 +995,6 @@ export default {
         })
         .catch(() => {});
     },
-    // 获取部门数据
-    getShuJu(data) {
-      exportBdgShuju(data).then((res) => {
-        this.DataTime = data;
-        this.registrationData = res;
-        this.cg = res.cg;
-        this.sb = res.sb;
-        this.tiems = res.time;
-      });
-    },
     // 搜索时间触发
     shiJian(data) {
       this.queryParams.diaryTime = data;
@@ -1011,9 +1087,15 @@ export default {
   min-height: 80px !important;
 }
 ::v-deep .el-dialog__body {
-  padding-left: 76px !important;
+  padding-left: 0px !important;
   padding-right: 0px !important;
-  padding-bottom: 20px !important;
+  padding-bottom: 0px !important;
+}
+::v-deep .el-dialog__body {
+  margin: 0px 0px 10px 68px;
+  padding-top: 20px !important;
+  box-sizing: border-box;
+  /* padding: 30px 12px 30px 28px; */
 }
 /* 富文本内容 */
 /* ::v-deep .editor{
@@ -1280,4 +1362,45 @@ export default {
 .app-container {
   height: calc(100vh - 108px) !important;
 }
+.shuJu {
+  height: 16px;
+  margin-top: 13px;
+  margin-right: 90px;
+  float: right;
+  /* background-color: red; */
+  color: #fff;
+  font-size: 14px;
+  position: absolute;
+  right: 10px;
+}
+.box44::before {
+  display: inline-block;
+  content: "";
+  width: 8px;
+  height: 8px;
+  /* border-radius: 50%; */
+  background-color: #1d96ff;
+  margin-left: 26px;
+}
+.box5::before {
+  display: inline-block;
+  content: "";
+  width: 8px;
+  height: 8px;
+  /* border-radius: 50%; */
+  background-color: #67c23a;
+  margin-left: 26px;
+}
+.box6::before {
+  display: inline-block;
+  content: "";
+  width: 8px;
+  height: 8px;
+  /* border-radius: 50%; */
+  background-color: #ff4949;
+  margin-left: 26px;
+}
+.mb8 {
+  height: 40px;
+}
 </style>

src/views/thought/thoughtPlan/index.vue

@@ -165,7 +165,7 @@
             size="btc"
             type="text"
             @click="handleUpdate1(scope.row)"
-            v-hasPermi="['thought:thoughtPlan:query']"
+            v-hasPermi="['thought:thoughtPlan:getDetails']"
             >响应</el-button
           >
           <el-button
@@ -173,7 +173,7 @@
             size="btu"
             type="text"
             @click="handleUpdate4(scope.row)"
-            v-hasPermi="['thought:thoughtPlan:query']"
+            v-hasPermi="['thought:thoughtPlan:updatePlan']"
             >修改</el-button
           >
           <el-button
@@ -406,11 +406,11 @@
                 >
                 </el-switch>
                 <span class="greed" v-if="item.responseStatus == '1'"
-                  >需要响应</span
+                  >响应</span
                 >
-                <span class="CCC" v-if="item.responseStatus == '0'"
+                <!-- <span class="CCC" v-if="item.responseStatus == '0'"
                   >非必要响应</span
-                >
+                > -->
               </el-form-item>
             </el-form>
           </div>
@@ -521,11 +521,11 @@
                 >
                 </el-switch>
                 <span class="greed" v-if="item.responseStatus == '1'"
-                  >需要响应</span
+                  >响应</span
                 >
-                <span class="CCC" v-if="item.responseStatus == '0'"
+                <!-- <span class="CCC" v-if="item.responseStatus == '0'"
                   >非必要响应</span
-                >
+                > -->
               </el-form-item>
             </el-form>
           </div>
@@ -646,11 +646,11 @@
                 >
                 </el-switch>
                 <span class="greed" v-if="item.responseStatus == '1'"
-                  >需要响应</span
+                  >响应</span
                 >
-                <span class="CCC" v-if="item.responseStatus == '0'"
+                <!-- <span class="CCC" v-if="item.responseStatus == '0'"
                   >非必要响应</span
-                >
+                > -->
               </el-form-item>
             </el-form>
           </div>
@@ -775,6 +775,13 @@
             </el-form-item>
           </el-form>
         </el-form>
+        <!-- <div
+          slot="footer"
+          class="dialog-footer"
+          style="text-align: right; margin-right: 76px; margin-top: 54px"
+        >
+          <el-button @click="cancel" size="btn">取 消</el-button>
+        </div> -->
       </div>
     </el-dialog>
   </div>
@@ -792,6 +799,8 @@ import {
   JXxiangYing,
   JXxiangYingXiangYing,
   getXiuGaiButton,
+  getResponse,
+  getModify,
 } from "@/api/thought/thoughtPlan";
 import { getWeiShu } from "@/api/grassrootsregistration/bdglmeeting";
 import { getUserProfile } from "@/api/system/user";
@@ -970,7 +979,7 @@ export default {
     handleUpdate1(row) {
       this.reset();
       const id = row.id || this.ids;
-      getThoughtPlan(id).then((response) => {
+      getResponse(id).then((response) => {
         this.form = response.data;
         this.checkShop = response.data.planFus;
         this.open1 = true;
@@ -1095,6 +1104,7 @@ export default {
       this.open = false;
       this.open1 = false;
       this.open2 = false;
+      this.open3 = false;
       this.reset();
     },
     // 表单重置
@@ -1178,20 +1188,16 @@ export default {
     handleUpdate4(row) {
       this.reset();
       const id = row.id || this.ids;
-      getXiuGaiButton(id).then((res) => {
-        if (res.code == "200") {
-          getThoughtPlan(id).then((response) => {
-            this.form = response.data;
-            this.checkShops = response.data.planFus;
-            response.data.planFujians.forEach((element) => {
-              element.name = element.fileName;
-              element.url = element.filePath;
-            });
-            this.planResponsefus = response.data.planFujians;
-            this.open = true;
-            this.title = "修改月教育计划";
-          });
-        }
+      getModify(id).then((response) => {
+        this.form = response.data;
+        this.checkShops = response.data.planFus;
+        response.data.planFujians.forEach((element) => {
+          element.name = element.fileName;
+          element.url = element.filePath;
+        });
+        this.planResponsefus = response.data.planFujians;
+        this.open = true;
+        this.title = "修改月教育计划";
       });
     },
     /** 提交按钮 */
@@ -1693,13 +1699,13 @@ export default {
 .greed {
   position: absolute;
   top: 26px;
-  right: 104px;
+  right: 97px;
   color: #13ce66;
 }
 .CCC {
   position: absolute;
   top: 26px;
-  right: 104px;
+  right: 92px;
   color: #cccccc;
 }
 /* 附件下载 */

web-types-npm-loader.xml

@@ -1,5 +0,0 @@
-<application>
-  <component name="WebTypesNpmLoader">
-    <enabled />
-  </component>
-</application>