Merge branch 'V0.0.2' of http://10.87.10.227:4000/jzyd_yyds/soc_web into V0.0.2

src/components/orgTree/orgDropDown.vue

@@ -17,29 +17,29 @@ export default {
   name: "orgDropTree",
   data() {
     return {
-      deptOptions: []
+      deptOptions: [],
     };
   },
   props: {
     value: {
-      type:String,      
+      type: String,
+    },
+    label: {
+      type: String,
+      default: "shortName",
     },
-    label:{
-      type:String,
-      default:'shortName'
-    }
   },
   watch: {
     // value(v){
     //   // debugger
     //   // console.info("watch",v);
-    // }   
+    // }
   },
   computed: {
-    val:sync('value')     ,
+    val: sync("value"),
   },
   components: { Treeselect },
-  
+
   methods: {
     /** 查询机构下拉树结构 */
     getDeptTree() {
@@ -76,3 +76,45 @@ export default {
   },
 };
 </script>
+<style scoped lang="scss">
+::v-deep {
+  .vue-treeselect__menu {
+    overflow-x: auto !important;
+    width: 250px;
+    max-height: 300px !important;
+  }
+
+  
+  .vue-treeselect__label {
+    overflow: unset;
+
+    text-overflow: unset;
+  }
+
+
+  .vue-treeselect div,
+  .vue-treeselect span {
+    box-sizing: content-box;
+
+    // white-space: nowrap;
+
+    // text-overflow: ellipsis;
+  }
+
+  // 选中后的溢出隐藏
+
+  .vue-treeselect__multi-value-label {
+    display: block;
+
+    width: 140px;
+
+    overflow: hidden;
+
+    white-space: nowrap;
+
+    text-overflow: ellipsis;
+  }
+
+
+}
+</style>

src/utils/ruoyi.js

@@ -210,7 +210,7 @@ export function tansParams(params) {
             let params = propName + '[' + key + ']';
             var subPart = encodeURIComponent(params) + "=";
             if(value[key] && Object.prototype.toString.call(value[key]) === '[object Date]'){
-              result += subPart + encodeURIComponent(value[key].toLocaleString()) + "&";
+              result += subPart +dayjs(value[key]).format("YYYY-MM-DD HH:mm:ss") + "&";
             }else{
               result += subPart + encodeURIComponent(value[key]) + "&";
             }

src/views/commonOption.js

@@ -1,5 +1,5 @@
-const getLabel=(options,value)=>{
-  let option=options.find(o=>o.value==value);
-  return option?option.label:'';
-}
-export { getLabel};
+const getLabel = (options, value, defaultText) => {
+  let option = options.find((o) => o.value == value);
+  return option ? option.label : defaultText != null ? defaultText : "";
+};
+export { getLabel };

src/views/information/configuration/index.vue

@@ -11,7 +11,7 @@
           <el-col :xs="24" :sm="12" :md="8" :lg="5">
             <el-form-item label="营业前提醒：" prop="front">
 
-              <el-input-number size="mini" style="width: 70%;" v-model="day.font" @change="handleChange" :min="1"
+              <el-input-number size="mini" style="width: 70%;" v-model="day.front" @change="handleChange" :min="1"
                 :max="10" label="描述文字"></el-input-number>
               分钟
 
@@ -53,41 +53,17 @@
               每周履职
             </div>
           </el-col>
-
-          <el-col :xs="24" :sm="12" :md="8" :lg="5">
+          <el-col>
             <el-form-item label="全天提醒：" prop="allDay">
               <el-input-number size="mini" style="width: 30%;" v-model="week.allDay" @change="handleChange" :min="1"
                 :max="10" label="描述文字"></el-input-number>
               分钟
             </el-form-item>
-          </el-col>
-
+          </el-col> 
         </el-row>
-
       </div>
     </el-form>
-    <!-- <el-form :model="week" :rules="rules" ref="week" label-width="130px">
-      <div class="form-item">
-        <el-row>
-          <el-col :xs="24" :sm="12" :md="8" :lg="4">
-            <div class="item-title">
-              每周履职
-            </div>
-          </el-col>
-      
-          <el-col :xs="24" :sm="12" :md="8" :lg="5">
-            <el-form-item label="提前提醒：" prop="allDay">
-
-              <el-input-number size="mini" style="width: 70%;" v-model="week.allDay" @change="handleChange" :min="1"
-                :max="10" label="描述文字"></el-input-number>
-              天
-
-
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </div>
-    </el-form> -->
+  
     <el-form :model="month" :rules="rules" ref="month" label-width="130px">
       <div class="form-item">
         <el-row>
@@ -96,13 +72,13 @@
               每月履职
             </div>
           </el-col>
-          <el-col :xs="24" :sm="12" :md="8" :lg="5">
-            <el-form-item label="提前提醒：" prop="educationType">
-              <el-input-number size="mini" v-model="num" style="width: 70%" @change="handleChange" :min="1" :max="10"
-                label="描述文字"></el-input-number>
-              天
+          <el-col>
+            <el-form-item label="全天提醒：" prop="allDay">
+              <el-input-number size="mini" style="width: 30%;" v-model="month.allDay" @change="handleChange" :min="1"
+                :max="10" label="描述文字"></el-input-number>
+              分钟
             </el-form-item>
-          </el-col>
+          </el-col> 
         </el-row>
       </div>
     </el-form>
@@ -114,12 +90,13 @@
               每季履职
             </div>
           </el-col>
-          <el-col :xs="24" :sm="12" :md="8" :lg="5">
-            <el-form-item label="提前提醒：" prop="educationType">
-              <el-input-number size="mini" v-model="num" style="width: 70%" @change="handleChange" :min="1" :max="10"
-                label="描述文字"></el-input-number>
+          <el-col>
+            <el-form-item label="全天提醒：" prop="allDay">
+              <el-input-number size="mini" style="width: 30%;" v-model="season.allDay" @change="handleChange" :min="1"
+                :max="10" label="描述文字"></el-input-number>
+              分钟
             </el-form-item>
-          </el-col>
+          </el-col> 
         </el-row>
       </div>
     </el-form>
@@ -131,12 +108,13 @@
               半年履职
             </div>
           </el-col>
-          <el-col :xs="24" :sm="12" :md="8" :lg="5">
-            <el-form-item label="提前提醒：" prop="educationType">
-              <el-input-number size="mini" v-model="num" style="width: 70%" @change="handleChange" :min="1" :max="10"
-                label="描述文字"></el-input-number>
+          <el-col>
+            <el-form-item label="全天提醒：" prop="allDay">
+              <el-input-number size="mini" style="width: 30%;" v-model="halfYear.allDay" @change="handleChange" :min="1"
+                :max="10" label="描述文字"></el-input-number>
+              分钟
             </el-form-item>
-          </el-col>
+          </el-col> 
         </el-row>
       </div>
     </el-form>
@@ -148,12 +126,13 @@
               每年履职
             </div>
           </el-col>
-          <el-col :xs="24" :sm="12" :md="8" :lg="5">
-            <el-form-item label="提前提醒：" prop="educationType">
-              <el-input-number size="mini" v-model="num" style="width: 70%" @change="handleChange" :min="1" :max="10"
-                label="描述文字"></el-input-number>
+          <el-col>
+            <el-form-item label="全天提醒：" prop="allDay">
+              <el-input-number size="mini" style="width: 30%;" v-model="year.allDay" @change="handleChange" :min="1"
+                :max="10" label="描述文字"></el-input-number>
+              分钟
             </el-form-item>
-          </el-col>
+          </el-col> 
         </el-row>
       </div>
     </el-form>
@@ -176,15 +155,36 @@ export default {
       day: {
         resumptionCycle: 1,
         allDay: null,
+        front: null,
         centre: null,
         after: null,
-        timeUnit: null,
+        timeUnit: 1,
+      },
+      week: {
+        resumptionCycle: 2,
+        allDay: null,
+        timeUnit: 2
+      },
+      month: {
+        resumptionCycle: 3,
+        allDay: null,
+        timeUnit: 2
+      },
+      season: {
+        resumptionCycle: 4,
+        allDay: null,
+        timeUnit: 2
+      },
+      halfYear: {
+        resumptionCycle: 5,
+        allDay: null,
+        timeUnit: 2
+      },
+      year: {
+        resumptionCycle: 6,
+        allDay: null,
+        timeUnit: 2
       },
-      week: {},
-      month: {},
-      season: {},
-      halfYear: {},
-      year: {},
 
       rules: {
         name: [
@@ -290,7 +290,7 @@ export default {
       if (!flag) return;
       let data = {
 
-        coreResumptionConfiguration: [this.day, this.week, this.month]
+        coreResumptionConfiguration: [this.day, this.week, this.month,this.season,this.halfYear,this.year]
       };
       insertConfiguration(data).then(response => {
         this.$modal.msgSuccess("新增成功");

src/views/resumption/protection/index.vue

@@ -151,7 +151,7 @@
             v-if="columns[4].visible"
           >
             <template slot-scope="r"
-              >{{ getLabel(dict.type.protection_status, r.row.status) }}
+              >{{ getLabel(dict.type.protection_status, r.row.status,"未知") }}
             </template>
           </el-table-column>
           <el-table-column
@@ -167,7 +167,7 @@
                 type="text"
                 icon="el-icon-edit"
                 @click="updateStatus(r.row.id, 1)"
-                v-hasPermi="['device:protection:maintain']"
+                v-hasPermi="['device:protectionstatus:maintain']"
                 >布防</el-button
               >
               <el-button
@@ -175,7 +175,7 @@
                 type="text"
                 icon="el-icon-edit"
                 @click="updateStatus(r.row.id, 0)"
-                v-hasPermi="['device:protection:maintain']"
+                v-hasPermi="['device:protectionstatus:maintain']"
                 >撤防</el-button
               > -->
               <el-button

src/views/resumption/taskManager/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="bg-transparent flex resumption">
+  <div class="app-container">
     <el-row :gutter="20">
       <!--机构数据-->
       <el-col :span="4" :xs="24">
@@ -412,7 +412,7 @@
 </template>
 
 <script>
-import { mapState, mapMutations } from "vuex";
+import {mapGetters } from "vuex";
 // import { Message } from "element-ui";
 import DialogDetail from "./dialog.detail";
 import DialogScanRecord from "./dialog.scanrecord";
@@ -513,6 +513,7 @@ export default {
         pageNum: 1,
         pageSize: 10,
       },
+      selectedOrgName:null,
       pageData: [],
       columns: [
         { key: 0, label: `序号`, visible: true },
@@ -618,10 +619,10 @@ export default {
     },
   },
   computed: {
-    ...mapState(["org", "loginUser"]),
+    ...mapGetters(["orgName"])
   },
   methods: {
-    ...mapMutations([]),
+   
     getLabel,
     toName(row) {
       // const ymd = row.ymd;
@@ -654,7 +655,12 @@ export default {
         });
         return;
       }
-      await api.exportResumptionRecord(this.queryParams);
+
+      this.download('/core/resumption/record/export', {
+        ...this.queryParams
+      }, `【${this.selectedOrgName}】-履职记录${new Date().getTime()}.xlsx`)
+
+      // await api.exportResumptionRecord(this.queryParams);
     },
     showDetail(row) {
       this.$refs.detaildialog.show(row.resumptionId, row.name);
@@ -666,6 +672,7 @@ export default {
 
     getDefaultKey(key) {
       this.queryParams.orgId = key;
+      this.selectedOrgName=this.orgName;
       this.getList();
       this.loadRoles(key);
       this.loadPlanList();
@@ -679,6 +686,7 @@ export default {
     // 节点单击事件
     clickTreeNode(data) {
       this.queryParams.orgId = data.id;
+      this.selectedOrgName=data.name;
       this.loadPlanList();
       this.loadRoles();
       this.getList();

src/views/system/bind/index.vue

@@ -23,7 +23,7 @@
           </el-form-item>
 
           <el-form-item label="标签编号" prop="code">
-            <el-input v-model="queryParams.code" placeholder="请输入标签编号" clearable @keyup.enter.native="handleQuery" />
+            <el-input maxlength="50" v-model="queryParams.code" placeholder="请输入标签编号" clearable @keyup.enter.native="handleQuery" />
           </el-form-item>