Merge branch 'dhy' of http://39.101.188.84:8000/suzhou-jichuang-lanhai/suzhouyingjiPC

package.json

@@ -48,7 +48,7 @@
     "js-beautify": "1.13.0",
     "js-cookie": "3.0.1",
     "jsencrypt": "3.0.0-rc.1",
-    "moment": "^2.24.0",
+    "moment": "^2.29.4",
     "nprogress": "0.2.0",
     "postcss-px2rem": "^0.3.0",
     "quill": "^1.3.6",

src/layout/newyjLayout.vue

@@ -111,15 +111,16 @@ export default {
     },
     //退出登录
     logout() {
+      
       this.$confirm("确定注销并退出系统吗？", "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning",
       })
         .then(() => {
-          this.$store.dispatch("LogOut").then(() => {
+          // this.$store.dispatch("LogOut").then(() => {
             this.$router.replace("/toLogin").catch(() => {});
-          });
+          // });
         })
         .catch(() => {});
     },

src/utils/request.js

@@ -17,7 +17,7 @@ const service = axios.create({
   // axios中请求配置有baseURL选项，表示请求URL公共部分
   baseURL: process.env.VUE_APP_BASE_API,
   // 超时
-  timeout: 10000,
+  timeout: 100000,
 });
 
 // request拦截器

src/views/yingji/enforcing.vue

@@ -37,9 +37,9 @@
         </div>
         <div class="my-checkbox">
           <el-checkbox-group v-model="checkList" @change="setmealSelect">
-            <el-checkbox label="全部"></el-checkbox>
+            <el-checkbox label="">全部</el-checkbox>
-            <el-checkbox label="已检查"></el-checkbox>
+            <el-checkbox label="1">已检查</el-checkbox>
-            <el-checkbox label="未检查"></el-checkbox>
+            <el-checkbox label="0">未检查</el-checkbox>
           </el-checkbox-group>
         </div>
       </div>
@@ -83,8 +83,16 @@
           header-align="center"
         >
         </el-table-column>
-        <!-- <el-table-column prop="state" label="状态" header-align="center">
+        <el-table-column prop="checkStatus" label="状态" header-align="center">
-        </el-table-column> -->
+          <template slot-scope="scope">
+            <div
+              style="font-family: 'Alibaba PuHuiTi'"
+              :class="scope.row.checkStatus == '0' ? 'isStyle' : ''"
+            >
+              {{ scope.row.checkStatus == 0 ? "未检查" : "已检查" }}
+            </div>
+          </template>
+        </el-table-column>
         <el-table-column label="操作" header-align="center">
           <template slot-scope="scope">
             <div class="tabs-btns">
@@ -152,14 +160,14 @@ export default {
       total: 0,
       options: [],
       //这个是点击搜索之前的值
-      district:'',
+      district: "",
       form: {
         district: "",
         plannedYear: "",
         //检测状态
         checkStatus: "",
       },
-      checkList: ["全部"],
+      checkList: [""],
       checkListTwo: [],
       listDes: [
         {
@@ -357,14 +365,12 @@ export default {
       this.checkList = this.checkList.slice(-1);
       if (this.checkList.length > 0) {
         this.checkListTwo = this.checkList;
-        this.changeList();
+        this.form.checkStatus = this.checkList[0]
       } else {
         this.checkList = this.checkListTwo;
       }
     },
-    changeList() {
+   
-      console.log(this.checkList[0]); // 拿到需要筛选的值
-    },
     // tabs不同行给不同class
     tableRowClassName({ row, rowIndex }) {
       if (rowIndex % 2 !== 0) {
@@ -407,6 +413,9 @@ export default {
 };
 </script>
   <style lang="scss" scoped>
+.isStyle {
+  color: #f71052;
+}
 .dialog-slot {
   .closeClick {
     position: absolute;

src/views/yingji/focusEnter.vue

@@ -15,9 +15,9 @@
           <div>
             <el-date-picker
               v-model="queryParms.year"
-              type="year"
+              type="month"
               placeholder="请选择"
-              value-format="yyyy"
+              value-format="yyyy-MM"
               size="small"
             >
             </el-date-picker>
@@ -68,7 +68,7 @@
         <el-table-column type="selection" width="55"></el-table-column>
         <el-table-column prop="year" label="计划年份" header-align="center">
           <template slot-scope="scope">
-            {{ scope.row.year }}
+            {{ $moment(scope.row.year).format("yyyy-MM") }}
           </template>
         </el-table-column>
         <el-table-column
@@ -156,12 +156,13 @@
                   <el-form-item label="年份:" prop="year">
                     <el-date-picker
                       v-model="form.year"
-                      type="year"
+                      type="month"
-                      placeholder="请选择年份"
+                      placeholder="请选择"
-                      value-format="yyyy"
+                      value-format="yyyy-MM"
                       size="small"
                     >
                     </el-date-picker>
+              
                   </el-form-item>
                 </el-col>
               </el-row>
@@ -579,7 +580,10 @@ export default {
           .el-input__inner {
             height: 33px;
           }
-          .el-input .el-input__suffix .el-input__suffix-inner .el-icon-arrow-up {
+          .el-input
+            .el-input__suffix
+            .el-input__suffix-inner
+            .el-icon-arrow-up {
             display: flex;
             align-items: center;
             justify-content: center;

vue.config.js

@@ -49,7 +49,7 @@ module.exports = {
       //   },
       // },
       '/api': {
-        target: `http://192.168.0.105:9033/pharmaceuticals`,
+        target: `http://39.101.188.84:9033/pharmaceuticals`,
         changeOrigin: true,
         pathRewrite: {
           '^/api': ''