fix bug

ruoyi-ui/src/views/components/table/deptTable.vue

@@ -27,16 +27,16 @@
     </el-form>
 
     <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['system:dept:add']"
-        >新增</el-button>
-      </el-col>
+      <!--      <el-col :span="1.5">
+              <el-button
+                type="primary"
+                plain
+                icon="el-icon-plus"
+                size="mini"
+                @click="handleAdd"
+                v-hasPermi="['system:dept:add']"
+              >新增</el-button>
+            </el-col>-->
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
@@ -45,43 +45,47 @@
       v-loading="loading"
       :data="deptList"
       row-key="deptId"
-      default-expand-all
+      :expand-row-keys="depands"
       :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
     >
-      <el-table-column prop="deptName" label="部门名称" width="260"></el-table-column>
-      <el-table-column prop="orderNum" label="排序" width="200"></el-table-column>
-      <el-table-column prop="status" label="状态" :formatter="statusFormat" width="100"></el-table-column>
-      <el-table-column label="创建时间" align="center" prop="createTime" width="200">
+      <el-table-column prop="deptName" label="部门名称"></el-table-column>
+      <el-table-column prop="deptId" label="部门编码"></el-table-column>
+      <!--      <el-table-column prop="orderNum" label="排序"></el-table-column>-->
+      <el-table-column prop="status" label="状态" :formatter="statusFormat"></el-table-column>
+      <el-table-column label="创建时间" align="center" prop="createTime">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.createTime) }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template slot-scope="scope">
-          <el-button 
-            size="mini" 
-            type="text" 
-            icon="el-icon-edit" 
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['system:dept:edit']"
-          >修改</el-button>
-          <el-button 
-            size="mini" 
-            type="text" 
-            icon="el-icon-plus" 
-            @click="handleAdd(scope.row)"
-            v-hasPermi="['system:dept:add']"
-          >新增</el-button>
-          <el-button
-            v-if="scope.row.parentId != 0"
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['system:dept:remove']"
-          >删除</el-button>
-        </template>
-      </el-table-column>
+      <!--      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+              <template slot-scope="scope">
+                <el-button
+                  size="mini"
+                  type="text"
+                  icon="el-icon-edit"
+                  @click="handleUpdate(scope.row)"
+                  v-hasPermi="['system:dept:edit']"
+                >修改
+                </el-button>
+                <el-button
+                  size="mini"
+                  type="text"
+                  icon="el-icon-plus"
+                  @click="handleAdd(scope.row)"
+                  v-hasPermi="['system:dept:add']"
+                >新增
+                </el-button>
+                <el-button
+                  v-if="scope.row.parentId != 0"
+                  size="mini"
+                  type="text"
+                  icon="el-icon-delete"
+                  @click="handleDelete(scope.row)"
+                  v-hasPermi="['system:dept:remove']"
+                >删除
+                </el-button>
+              </template>
+            </el-table-column>-->
     </el-table>
 
     <!-- 添加或修改部门对话框 -->
@@ -90,32 +94,32 @@
         <el-row>
           <el-col :span="24" v-if="form.parentId !== 0">
             <el-form-item label="上级部门" prop="parentId">
-              <treeselect v-model="form.parentId" :options="deptOptions" :normalizer="normalizer" placeholder="选择上级部门" />
+              <treeselect v-model="form.parentId" :options="deptOptions" :normalizer="normalizer" placeholder="选择上级部门"/>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="部门名称" prop="deptName">
-              <el-input v-model="form.deptName" placeholder="请输入部门名称" />
+              <el-input v-model="form.deptName" placeholder="请输入部门名称"/>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="显示排序" prop="orderNum">
-              <el-input-number v-model="form.orderNum" controls-position="right" :min="0" />
+              <el-input-number v-model="form.orderNum" controls-position="right" :min="0"/>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="负责人" prop="leader">
-              <el-input v-model="form.leader" placeholder="请输入负责人" maxlength="20" />
+              <el-input v-model="form.leader" placeholder="请输入负责人" maxlength="20"/>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="联系电话" prop="phone">
-              <el-input v-model="form.phone" placeholder="请输入联系电话" maxlength="11" />
+              <el-input v-model="form.phone" placeholder="请输入联系电话" maxlength="11"/>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="邮箱" prop="email">
-              <el-input v-model="form.email" placeholder="请输入邮箱" maxlength="50" />
+              <el-input v-model="form.email" placeholder="请输入邮箱" maxlength="50"/>
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -125,7 +129,8 @@
                   v-for="dict in statusOptions"
                   :key="dict.dictValue"
                   :label="dict.dictValue"
-                >{{dict.dictLabel}}</el-radio>
+                >{{ dict.dictLabel }}
+                </el-radio>
               </el-radio-group>
             </el-form-item>
           </el-col>
@@ -140,13 +145,13 @@
 </template>
 
 <script>
-import { listDept, getDept, delDept, addDept, updateDept, listDeptExcludeChild } from "@/api/system/dept";
+import {addDept, delDept, getDept, listDept, listDeptExcludeChild, updateDept} from "@/api/system/dept";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 
 export default {
   name: "Dept",
-  components: { Treeselect },
+  components: {Treeselect},
   data() {
     return {
       // 遮罩层
@@ -157,6 +162,7 @@ export default {
       deptList: [],
       // 部门树选项
       deptOptions: [],
+      depands: ['060000'],
       // 弹出层标题
       title: "",
       // 是否显示弹出层
@@ -173,13 +179,13 @@ export default {
       // 表单校验
       rules: {
         parentId: [
-          { required: true, message: "上级部门不能为空", trigger: "blur" }
+          {required: true, message: "上级部门不能为空", trigger: "blur"}
         ],
         deptName: [
-          { required: true, message: "部门名称不能为空", trigger: "blur" }
+          {required: true, message: "部门名称不能为空", trigger: "blur"}
         ],
         orderNum: [
-          { required: true, message: "显示排序不能为空", trigger: "blur" }
+          {required: true, message: "显示排序不能为空", trigger: "blur"}
         ],
         email: [
           {
@@ -265,7 +271,7 @@ export default {
       this.open = true;
       this.title = "添加部门";
       listDept().then(response => {
-	        this.deptOptions = this.handleTree(response.data, "deptId");
+        this.deptOptions = this.handleTree(response.data, "deptId");
       });
     },
     /** 修改按钮操作 */
@@ -277,11 +283,11 @@ export default {
         this.title = "修改部门";
       });
       listDeptExcludeChild(row.deptId).then(response => {
-	        this.deptOptions = this.handleTree(response.data, "deptId");
+        this.deptOptions = this.handleTree(response.data, "deptId");
       });
     },
     /** 提交按钮 */
-    submitForm: function() {
+    submitForm: function () {
       this.$refs["form"].validate(valid => {
         if (valid) {
           if (this.form.deptId != undefined) {
@@ -303,16 +309,17 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       this.$confirm('是否确认删除名称为"' + row.deptName + '"的数据项?', "警告", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(function() {
-          return delDept(row.deptId);
-        }).then(() => {
-          this.getList();
-          this.msgSuccess("删除成功");
-        }).catch(() => {});
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(function () {
+        return delDept(row.deptId);
+      }).then(() => {
+        this.getList();
+        this.msgSuccess("删除成功");
+      }).catch(() => {
+      });
     }
   }
 };
-</script>
+</script>

ruoyi-ui/src/views/components/table/homeTable.vue

@@ -84,6 +84,7 @@
               @change='getSo2Time'
               value-format='yyyy-MM'
               v-model="shipDate.startMonth"
+              :picker-options="startMonth"
               size="small"
               type="month"
               placeholder="选择月份">
@@ -93,6 +94,7 @@
           <div style="float:left;margin-left:3rem;width: 55rem;">
             <el-date-picker
               v-model="shipDate.endMonth"
+              :picker-options="endMonth"
               size="small"
               @change='getSo2Time'
               value-format='yyyy-MM'
@@ -216,7 +218,31 @@ export default {
         // {"name": "四号船", "locations": [[118.639711, 31.96602]], 'type': 3,"head":180},
         // {"name": "五号船", "locations": [[118.639711, 31.96602]], 'type': 2,"head":270},
         // {"name": "五号船", "locations": [[118.639711, 31.96602]], 'type': 2,"head":360},
-      ]
+      ],
+      startMonth: {
+        disabledDate: time => {
+          if (this.shipDate.endMonth) {
+            return (
+              time.getTime() > new Date(this.shipDate.endMonth).getTime() || time.getTime() < new Date('2021-06-01').getTime()
+            );
+          } else {
+            return time.getTime() > Date.now() || time.getTime() < new Date('2021-06-01').getTime();
+          }
+        }
+      },
+      endMonth: {
+        disabledDate: time => {
+          if (this.shipDate.startMonth) {
+            return (
+              time.getTime() > Date.now() ||
+              time.getTime() < new Date(this.shipDate.startMonth).getTime() - 86400000 ||
+              time.getTime() < new Date('2021-06-01').getTime()
+            );
+          } else {
+            return time.getTime() > Date.now() || time.getTime() < new Date('2021-06-01').getTime();
+          }
+        }
+      }
     }
   }, mounted() {
     this.getMonthDate();
@@ -269,9 +295,9 @@ export default {
         ship["course"] = ship.course == null ? '-' : ship.course;
         // ship["monitorPointName"] = '-';
 
-         for (var i in this.ship) {
-           var obj = this.ship[i];
-           obj["isc"] = "2";
+        for (var i in this.ship) {
+          var obj = this.ship[i];
+          obj["isc"] = "2";
         }
         var obj = ship;
         obj["isc"] = "1";
@@ -454,7 +480,7 @@ export default {
         } else if (obj.type == 3) {
           img = 'wg.png'
         }
-        if(obj["isc"] == "1"){
+        if (obj["isc"] == "1") {
           img = 'xz.png'
         }
         tt.push([obj.locations, obj, img, 'ship', ((obj.head == null ? 0 : parseFloat(obj.head)) - 90) * Math.PI / 180, 1]);
@@ -623,7 +649,7 @@ export default {
           axisLabel: {
             show: true,  //这里的show用于设置是否显示x轴下的字体 默认为true
             interval: 0,  //可以设置成 0 强制显示所有标签。如果设置为 1，表示『隔一个标签显示一个标签』，如果值为 2，表示隔两个标签显示一个标签，以此类推。
-
+            rotate: "45",
             textStyle: {   //textStyle里面写x轴下的字体的样式
               color: '#ffffff',
               fontSize: 13
@@ -896,18 +922,18 @@ export default {
       };
       myChart.setOption(option);
       var that = this;
-      myChart.on('click', function(params){
-           if(params.name == "黑烟"){
-             that.$parent.showTable = 9;
-           }
-           if(params.name == "光谱"){
-             that.$parent.showTable = 10;
-           }
-           if(params.name == "嗅探"){
-             that.$parent.showTable = 11;
-           }
-
-       });
+      myChart.on('click', function (params) {
+        if (params.name == "黑烟") {
+          that.$parent.showTable = 9;
+        }
+        if (params.name == "光谱") {
+          that.$parent.showTable = 10;
+        }
+        if (params.name == "嗅探") {
+          that.$parent.showTable = 11;
+        }
+
+      });
     }
   }
 }

ruoyi-ui/src/views/components/table/liuTable.vue

@@ -9,6 +9,7 @@
         <el-col :span="3">
           <el-date-picker
             v-model="queryParams.startTime"
+            :picker-options="startTime"
             type="date"
             placeholder="选择日期"
             value-format="yyyy-MM-dd">
@@ -21,6 +22,7 @@
         <el-col :span="3">
           <el-date-picker
             v-model="queryParams.endTime"
+            :picker-options="endTime"
             type="date"
             placeholder="选择日期"
             value-format="yyyy-MM-dd">
@@ -334,7 +336,7 @@
 
         <div class="dialogDiv" v-show="!dialogShow">
           <span class="dialogFont" style="margin-left:10rem">燃油硫含量报警阈值(%)</span>
-          <el-input v-model="liuCount" placeholder="请输入内容" style="width:30rem;margin-left:15rem"></el-input>
+          <el-input-number v-model="liuCount" :precision="2" :step="0.1" :max="10" style="width:65rem;margin-left:8rem"></el-input-number>
           <button style="margin-left:13rem;" class="dialogButton" @click="getThresholdEdit">保存</button>
           <button style="margin-left:7rem;" class="dialogButton" @click="dialogShow=true">取消</button>
         </div>
@@ -416,7 +418,32 @@ export default {
         value: '选项2',
         label: '已处置'
       }],
-      tableData: []
+      tableData: [],
+      /* start 开始时间小于今天,结束时间不能大于开始时间 */
+      startTime: {
+        disabledDate: time => {
+          if (this.queryParams.endTime) {
+            return (
+              time.getTime() > new Date(this.queryParams.endTime).getTime()
+            );
+          } else {
+            return time.getTime() > Date.now();
+          }
+        }
+      },
+      endTime: {
+        disabledDate: time => {
+          if (this.queryParams.startTime) {
+            return (
+              time.getTime() > Date.now() ||
+              time.getTime() < new Date(this.queryParams.startTime).getTime() - 86400000
+            );
+          } else {
+            return time.getTime() > Date.now();
+          }
+        }
+      },
+      /* end*/
     }
   },
   // mounted() {

ruoyi-ui/src/views/components/table/statisticalTable.vue

@@ -8,6 +8,7 @@
             <!-- <div style="width:20rem;float:left"> -->
             <el-date-picker
               v-model="liuDate"
+              :picker-options="liuDateOption"
               type="month"
               placeholder="选择月份"
               size='mini'
@@ -28,6 +29,7 @@
             <!-- <div style="width:20rem"> -->
             <el-date-picker
               v-model="blackDate"
+              :picker-options="liuDateOption"
               type="month"
               placeholder="选择月份"
               size='mini'
@@ -96,7 +98,12 @@ export default {
           value: "2021-08",
           label: '2021年8月'
         }
-      ]
+      ],
+      liuDateOption: {
+        disabledDate: time => {
+          return time.getTime() > Date.now();
+        }
+      }
     };
   },
   mounted() {
@@ -226,11 +233,11 @@ export default {
     },
     liuPie() {
       getSo2SnapPos({'month': this.liuDate}).then(response => {
-        console.log(response);
+        // console.log(response);
         var myChart = this.$echarts.init(document.getElementById('liuPieChart'));
         var series = [];
         for (var index in this.so2Name) {
-          console.log(this.so2Name[index].dictLabel);
+          // console.log(this.so2Name[index].dictLabel);
           var object = {
             'value': response.data[this.so2Name[index].dictLabel],
             'name': this.so2Name[index].dictLabel,
@@ -256,10 +263,10 @@ export default {
               name: '检测点',
               type: 'pie',
               radius: ['40%', '70%'],
-              avoidLabelOverlap: false,
+              avoidLabelOverlap: true,
               label: {
                 alignTo: 'labelLine',
-                formatter: '{name|{b}}\n{time|{d} %}',
+                formatter: '{name|{b}}  {time|{d} %}',
                 minMargin: 5,
                 edgeDistance: 10,
                 lineHeight: 15,
@@ -318,10 +325,10 @@ export default {
               name: '检测点',
               type: 'pie',
               radius: ['40%', '70%'],
-              avoidLabelOverlap: false,
+              avoidLabelOverlap: true,
               label: {
                 alignTo: 'labelLine',
-                formatter: '{name|{b}}\n{time|{d} %}',
+                formatter: '{name|{b}}  {time|{d} %}',
                 minMargin: 5,
                 edgeDistance: 10,
                 lineHeight: 15,

ruoyi-ui/src/views/components/table/userTable.vue

@@ -66,19 +66,19 @@
                 v-hasPermi="['system:user:remove']"
               >删除
               </el-button>
-              <el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)">
-                <span class="el-dropdown-link">
-                  <i class="el-icon-d-arrow-right el-icon--right"></i>更多
-                </span>
-                <el-dropdown-menu slot="dropdown">
-                  <!--                  <el-dropdown-item command="handleResetPwd" icon="el-icon-key"-->
-                  <!--                                    v-hasPermi="['system:user:resetPwd']">重置密码-->
-                  <!--                  </el-dropdown-item>-->
-                  <el-dropdown-item command="handleAuthRole" icon="el-icon-circle-check"
-                                    v-hasPermi="['system:user:edit']">分配角色
-                  </el-dropdown-item>
-                </el-dropdown-menu>
-              </el-dropdown>
+              <!--              <el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)">
+                              <span class="el-dropdown-link">
+                                <i class="el-icon-d-arrow-right el-icon&#45;&#45;right"></i>更多
+                              </span>
+                              <el-dropdown-menu slot="dropdown">
+                                &lt;!&ndash;                  <el-dropdown-item command="handleResetPwd" icon="el-icon-key"&ndash;&gt;
+                                &lt;!&ndash;                                    v-hasPermi="['system:user:resetPwd']">重置密码&ndash;&gt;
+                                &lt;!&ndash;                  </el-dropdown-item>&ndash;&gt;
+                                <el-dropdown-item command="handleAuthRole" icon="el-icon-circle-check"
+                                                  v-hasPermi="['system:user:edit']">分配角色
+                                </el-dropdown-item>
+                              </el-dropdown-menu>
+                            </el-dropdown>-->
             </template>
           </el-table-column>
         </el-table>

ruoyi-ui/src/views/components/table/xtTable.vue

@@ -10,6 +10,7 @@
         <el-col :span="3">
           <el-date-picker
             v-model="queryParams.beginTime"
+            :picker-options="beginTime"
             type="date"
             placeholder="选择日期时间"
             value-format="yyyy-MM-dd">
@@ -22,6 +23,7 @@
         <el-col :span="3">
           <el-date-picker
             v-model="queryParams.endTime"
+            :picker-options="endTime"
             type="date"
             placeholder="选择日期时间"
             value-format="yyyy-MM-dd">
@@ -197,10 +199,6 @@ style="width:20rem;height:20rem;display:inline-block;margin-right:10px"
                 :preview-src-list="scope.row.allImgUrl">
               </el-image>
             </el-badge>
-
-            <!-- <img style="width:40rem;height:40rem" src="https://ns-strategy.cdn.bcebos.com/ns-strategy/upload/fc_big_pic/part-00315-1423.jpg"/>  -->
-
-            <!-- <div>{{item.replace(' ','')}}</div> -->
           </div>
           <!-- <video style="width:40rem;height:40rem" controls="" autoplay="" name="media"><source src="http://clips.vorwaerts-gmbh.de/big_buck_bunny.mp4" type="video/mp4"></video> -->
           <!-- <div>{{scope.row.sootImgUrl}}</div> -->
@@ -288,7 +286,32 @@ export default {
         }
       ],
       jianceOptions: [],
-      tableData: []
+      tableData: [],
+      /* start 开始时间小于今天,结束时间不能大于开始时间 */
+      beginTime: {
+        disabledDate: time => {
+          if (this.queryParams.endTime) {
+            return (
+              time.getTime() > new Date(this.queryParams.endTime).getTime()
+            );
+          } else {
+            return time.getTime() > Date.now();
+          }
+        }
+      },
+      endTime: {
+        disabledDate: time => {
+          if (this.queryParams.beginTime) {
+            return (
+              time.getTime() > Date.now() ||
+              time.getTime() < new Date(this.queryParams.beginTime).getTime() - 86400000
+            );
+          } else {
+            return time.getTime() > Date.now();
+          }
+        }
+      },
+      /* end*/
     }
   },
   created() {

ruoyi-ui/src/views/monitor/logininfor/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="70px">
       <el-form-item label="登录地址" prop="ipaddr">
         <el-input
           v-model="queryParams.ipaddr"