Merge branch 'V0.0.4' of http://10.87.21.221:8000/jzyd_yyds/soc_web into V0.0.4

.env.development

@@ -6,11 +6,19 @@ ENV = 'development'
 
 # 开发环境
 #测试地址
+<<<<<<< HEAD
+#VUE_APP_BASE_API = 'http://47.92.229.224:8080'
+#罗俊
+#VUE_APP_BASE_API = 'http://10.87.21.60:8080'
+#罗伟
+  VUE_APP_BASE_API = 'http://10.87.23.62:8080'
+=======
 # VUE_APP_BASE_API = 'http://47.92.229.224:8080'
 #罗俊
 #VUE_APP_BASE_API = 'http://10.87.21.60:8080'
 #罗伟
  VUE_APP_BASE_API = 'http://10.87.23.62:8080'
+>>>>>>> d909b77fe3593021b73d72d6276f6df848c73f8a
 #高雄
 #VUE_APP_BASE_API = 'http://10.87.11.94:8080'
 #景远超

package.json

@@ -40,24 +40,24 @@
     "@riophae/vue-treeselect": "0.4.0",
     "axios": "0.24.0",
     "clipboard": "2.0.8",
-    "core-js": "^3.34.0",
     "core.js": "^0.4.2",
     "dayjs": "^1.11.9",
     "echarts": "5.4.0",
     "element-ui": "2.15.12",
     "file-saver": "2.0.5",
     "fuse.js": "6.4.3",
+    "gm-crypt": "0.0.2",
     "highlight.js": "10.7.3",
     "js-beautify": "1.13.0",
     "js-cookie": "3.0.1",
     "jsencrypt": "3.0.0-rc.1",
+    "moment": "^2.29.4",
     "node-polyfill-webpack-plugin": "^3.0.0",
     "nprogress": "0.2.0",
     "quill": "1.3.7",
     "screenfull": "5.0.2",
     "sortablejs": "1.10.2",
     "vue": "2.6.12",
-    "gm-crypt": "0.0.2",
     "vue-count-to": "1.0.13",
     "vue-cropper": "0.5.5",
     "vue-meta": "2.4.0",
@@ -73,6 +73,7 @@
     "chalk": "4.1.0",
     "compression-webpack-plugin": "5.0.2",
     "connect": "3.6.6",
+    "core-js": "^3.34.0",
     "html-webpack-plugin": "^5.5.3",
     "lint-staged": "10.5.3",
     "runjs": "4.4.2",

src/views/core/accessPlan/index.vue

@@ -122,7 +122,6 @@
                   size="mini"
                   @click="handleAdd"
                   v-hasPermi="['core:accessPlan:add']"
-                  
                   >新增任务
                 </el-button>
               </el-col>
@@ -239,7 +238,7 @@
                     (scope.row.planStatus == 0 || scope.row.planStatus == 2)
                   "
                   @click="handDistribute(scope.row)"
-                  v-hasPermi="['core:accessPlan:add']"
+                  v-hasPermi="['core:accessPlan:release']"
                   >下发
                 </el-button>
                 <el-button
@@ -253,6 +252,7 @@
                     scope.row.parentId == null
                   "
                   @click="handWithdraw(scope.row)"
+                  v-hasPermi="['core:accessPlan:withdraw']"
                   >撤回
                 </el-button>
                 <el-button
@@ -260,7 +260,7 @@
                   type="text"
                   icon="el-icon-edit-outline"
                   @click="handleUpdate(scope.row)"
-                  v-if="scope.row.orgId == isEdit && check == true"
+                  v-if="scope.row.orgId == isEdit"
                   v-hasPermi="['core:accessPlan:edit', 'core:accessPlan:query']"
                   >编辑
                 </el-button>
@@ -270,8 +270,7 @@
                   type="text"
                   v-if="
                     scope.row.parentOrgId == isEdit &&
-                    scope.row.parentId == null &&
-                    check == true
+                    scope.row.parentId == null 
                   "
                   icon="el-icon-delete"
                   @click="handleDelete(scope.row)"

src/views/core/drill/task/index.vue

@@ -356,7 +356,7 @@ export default {
         orgId: this.$store.getters.orgId,
         type: null,
         status: null,
-        range: null,
+        range: [new Date(),new Date()],
       },
       // 表单参数
       form: {},
@@ -428,7 +428,7 @@ export default {
       this.queryParams.title = null;
       this.queryParams.type = null;
       this.queryParams.status = null;
-      this.queryParams.range = [];
+      this.queryParams.range =  [new Date(),new Date()];
       this.queryParams.orgId = this.orgId;
       this.selectedOrgName = this.orgName;
       this.queryParams.checkSub = true;

src/views/core/edu/task/index.vue

@@ -348,7 +348,7 @@ export default {
         orgId: this.$store.getters.orgId,
         type: null,
         status: null,
-        range: null,
+        range:  [new Date(),new Date()],
       },
       // 表单参数
       form: {},
@@ -405,7 +405,7 @@ export default {
     clearQueryForm() {
       this.queryParams.title = null;
       this.queryParams.status = null;
-      this.queryParams.range = [];
+      this.queryParams.range =  [new Date(),new Date()];
       this.queryParams.orgId = this.orgId;
       this.selectedOrgName = this.orgName;
       this.queryParams.checkSub = true;

src/views/resumptionEvaluate/evaluate/index.vue

@@ -176,6 +176,7 @@
                 <el-button
                   size="mini"
                   @click="publishHandler(row)"
+                  v-hasPermi="['core:evaluatePlan:distribute']"
                   type="text"
                   v-if="row.orgId == isEdit && row.status == 0"
                   :class="

src/views/safetyBook/newBook/dialog.des.vue

@@ -48,7 +48,7 @@
                 v-model="formData.orgName"
                 :disabled="true"
               ></el-input>
-               
+
               </el-form-item> -->
             <el-descriptions-item labelClassName="gx_info_label" label="甲方姓名">
               {{ formData.partyA }}
@@ -128,7 +128,7 @@
                   :preview-src-list="[file.url]"
                   fit="contain"
                 ></el-image>
-                <div v-else="isPic(file.url)">
+                <div v-else>
                   <el-link :href="file.url" :underline="false" target="_blank">
                     <span class="el-icon-document"> {{ file.name }} </span>
                   </el-link>
@@ -292,14 +292,14 @@ export default {
   }
 }
 .container {
-  width: 50px;
   height: 50px;
-  float: left;
+  display: flex;
+  justify-content: flex-start;
   .item {
-    width: 100%;
+    width: 50px;
     height: 100%;
   }
-  .item img {
+  .item >img {
     width: 100% !important;
     object-fit: cover !important;
   }

src/views/safetycheck/task/index.vue

@@ -420,6 +420,7 @@ import { checkPermi } from "@/utils/permission.js";
 import dayjs from "dayjs";
 import { deptTreeSelect } from "@/api/system/public";
 import request from "@/utils/request";
+import {newline} from "js-beautify/js/src/javascript/acorn";
 export default {
   name: "Saftask",
   dicts: ["resumption_plan_cycle", "resumption_status", "safety_check_status"],
@@ -453,7 +454,7 @@ export default {
         planStartTime: null,
         title: null,
         checkOrgIds: null,
-        range: [],
+        range: [new Date(),new Date()],
       },
       selectedOrgName: null,
       pageData: [],
@@ -594,14 +595,14 @@ export default {
       this.getList();
     },
     resetQuery() {
-      this.queryParams.checkOrgIds = null;
-      this.queryParams.range = [];
       this.resetForm("queryParams");
+      this.queryParams.checkOrgIds = null;
       this.queryParams.orgId = this.orgId;
       this.selectedOrgName = this.orgName;
       this.queryParams.checkSub = true;
-      this.$refs["orgTree"].setCheckSub(this.queryParams.checkSub)
-      this.getList();
+      this.$refs["orgTree"].setCheckSub(this.queryParams.checkSub);
+      this.queryParams.range = [new Date(),new Date()];
+
     },
     handleAdd() {
       let path = "/safetycheck/tempregister/add";

src/views/system/dept/extend.vue

@@ -252,8 +252,8 @@
                   :value="dict.value"
                 ></el-option>
               </el-select>
-            </el-descriptions-item>
-
+            </el-descriptions-item> 
+    
             <el-descriptions-item v-if="type === org_type.yewd" labelClassName="gx_info_label" label="是否配备保安人员">
               <el-radio-group v-model="askari">
                 <el-radio :label="1">是</el-radio>
@@ -509,6 +509,7 @@
 
   export default {
     dicts: [
+    "duty_options",
       "sys_org_type",
       "org_platform_brand",
       "org_platform_supplier_brand",
@@ -521,7 +522,6 @@
       "org_extend_detached_standard",
       "org_extend_is",
       "property_situation",
-      "duty_options",
     ],
     props: [],
     components: {