有限空间作业

package.json

-{
-  "name": "GavelDmg",
-  "version": "0.0.1",
-  "description": "GavelDmg",
-  "author": "Gavel",
-  "license": "MIT",
-  "scripts": {
-    "clear": "rmdir /s/q node_modules",
-    "serve": "vue-cli-service serve",
-    "devbuild": "vue-cli-service build --mode development",
-    "build": "vue-cli-service build",
-    "build:report": "vue-cli-service build --report",
-    "build:stage": "vue-cli-service build --mode staging",
-    "preview": "node build/index.js --preview",
-    "lint": "eslint --ext .js,.vue src"
-  },
-  "husky": {
-    "hooks": {
-      "pre-commit": "lint-staged"
-    }
-  },
-  "lint-staged": {
-    "src/**/*.{js,vue}": [
-      "eslint --fix",
-      "git add"
-    ]
-  },
-  "keywords": [
-    "vue",
-    "admin",
-    "dashboard",
-    "element-ui",
-    "boilerplate",
-    "admin-template",
-    "management-system"
-  ],
-  "repository": {
-    "type": "git",
-    "url": "https://gitee.com/y_project/RuoYi-Vue.git"
-  },
-  "dependencies": {
-    "@riophae/vue-treeselect": "0.4.0",
-    "axios": "0.24.0",
-    "clipboard": "2.0.8",
-    "common": "file:/Users/forwards/Dev/common",
-    "core-js": "3.19.1",
-    "echarts": "^4.9.0",
-    "element-ui": "2.15.8",
-    "file-saver": "2.0.5",
-    "fuse.js": "6.4.3",
-    "highlight.js": "9.18.5",
-    "js-beautify": "1.13.0",
-    "js-cookie": "3.0.1",
-    "jsencrypt": "3.0.0-rc.1",
-    "nprogress": "0.2.0",
-    "quill": "1.3.7",
-    "screenfull": "5.0.2",
-    "sortablejs": "1.10.2",
-    "typescript": "^4.5.2",
-    "vue": "2.6.12",
-    "vue-class-component": "^7.2.3",
-    "vue-count-to": "1.0.13",
-    "vue-cropper": "0.5.5",
-    "vue-meta": "2.4.0",
-    "vue-router": "3.4.9",
-    "vue-seamless-scroll": "^1.1.23",
-    "vue-video-player": "5.0",
-    "vuedraggable": "^2.24.3",
-    "vuex": "3.6.0"
-  },
-  "devDependencies": {
-    "@vue/cli-plugin-babel": "4.4.6",
-    "@vue/cli-plugin-eslint": "4.4.6",
-    "@vue/cli-service": "4.4.6",
-    "babel-eslint": "10.1.0",
-    "babel-plugin-dynamic-import-node": "2.3.3",
-    "babel-plugin-transform-remove-console": "^6.9.4",
-    "babel-plugin-transform-remove-debugger": "^6.9.4",
-    "chalk": "4.1.0",
-    "compression-webpack-plugin": "5.0.2",
-    "connect": "3.6.6",
-    "eslint": "7.15.0",
-    "eslint-plugin-vue": "7.2.0",
-    "lint-staged": "10.5.3",
-    "runjs": "4.4.2",
-    "sass": "1.32.13",
-    "sass-loader": "10.1.1",
-    "script-ext-html-webpack-plugin": "2.1.5",
-    "svg-sprite-loader": "5.1.1",
-    "ts-loader": "~8.2.0",
-    "vue-particles": "^1.0.9",
-    "vue-property-decorator": "^9.1.2",
-    "vue-template-compiler": "2.6.12"
-  },
-  "engines": {
-    "node": ">=8.9",
-    "npm": ">= 3.0.0"
-  },
-  "browserslist": [
-    "> 1%",
-    "last 2 versions"
-  ]
-}
+{
+  "name": "GavelDmg",
+  "version": "0.0.1",
+  "description": "GavelDmg",
+  "author": "Gavel",
+  "license": "MIT",
+  "scripts": {
+    "clear": "rmdir /s/q node_modules",
+    "serve": "vue-cli-service serve",
+    "devbuild": "vue-cli-service build --mode development",
+    "build": "vue-cli-service build",
+    "build:report": "vue-cli-service build --report",
+    "build:stage": "vue-cli-service build --mode staging",
+    "preview": "node build/index.js --preview",
+    "lint": "eslint --ext .js,.vue src"
+  },
+  "husky": {
+    "hooks": {
+      "pre-commit": "lint-staged"
+    }
+  },
+  "lint-staged": {
+    "src/**/*.{js,vue}": [
+      "eslint --fix",
+      "git add"
+    ]
+  },
+  "keywords": [
+    "vue",
+    "admin",
+    "dashboard",
+    "element-ui",
+    "boilerplate",
+    "admin-template",
+    "management-system"
+  ],
+  "repository": {
+    "type": "git",
+    "url": "https://gitee.com/y_project/RuoYi-Vue.git"
+  },
+  "dependencies": {
+    "@riophae/vue-treeselect": "0.4.0",
+    "axios": "0.24.0",
+    "clipboard": "2.0.8",
+    "common": "file:D://common",
+    "core-js": "3.19.1",
+    "echarts": "^4.9.0",
+    "element-ui": "2.15.8",
+    "file-saver": "2.0.5",
+    "fuse.js": "6.4.3",
+    "highlight.js": "9.18.5",
+    "js-beautify": "1.13.0",
+    "js-cookie": "3.0.1",
+    "jsencrypt": "3.0.0-rc.1",
+    "nprogress": "0.2.0",
+    "quill": "1.3.7",
+    "screenfull": "5.0.2",
+    "sortablejs": "1.10.2",
+    "typescript": "^4.5.2",
+    "vue": "2.6.12",
+    "vue-class-component": "^7.2.3",
+    "vue-count-to": "1.0.13",
+    "vue-cropper": "0.5.5",
+    "vue-meta": "2.4.0",
+    "vue-router": "3.4.9",
+    "vue-seamless-scroll": "^1.1.23",
+    "vue-video-player": "5.0",
+    "vuedraggable": "^2.24.3",
+    "vuex": "3.6.0"
+  },
+  "devDependencies": {
+    "@vue/cli-plugin-babel": "4.4.6",
+    "@vue/cli-plugin-eslint": "4.4.6",
+    "@vue/cli-service": "4.4.6",
+    "babel-eslint": "10.1.0",
+    "babel-plugin-dynamic-import-node": "2.3.3",
+    "babel-plugin-transform-remove-console": "^6.9.4",
+    "babel-plugin-transform-remove-debugger": "^6.9.4",
+    "chalk": "4.1.0",
+    "compression-webpack-plugin": "5.0.2",
+    "connect": "3.6.6",
+    "eslint": "7.15.0",
+    "eslint-plugin-vue": "7.2.0",
+    "lint-staged": "10.5.3",
+    "runjs": "4.4.2",
+    "sass": "1.32.13",
+    "sass-loader": "10.1.1",
+    "script-ext-html-webpack-plugin": "2.1.5",
+    "svg-sprite-loader": "5.1.1",
+    "ts-loader": "~8.2.0",
+    "vue-particles": "^1.0.9",
+    "vue-property-decorator": "^9.1.2",
+    "vue-template-compiler": "2.6.12"
+  },
+  "engines": {
+    "node": ">=8.9",
+    "npm": ">= 3.0.0"
+  },
+  "browserslist": [
+    "> 1%",
+    "last 2 versions"
+  ]
+}

src/api/spaceOperations/declare.js

+import request from 'common/src/utils/request'
+
+/* query */
+export function doQuery(query) {
+  return request({
+    url: '/aqgl/yxkjzygl/query',
+    method: 'post',
+    data: query||{}
+  })
+}
+/* 更新 */
+export function doUpdate(query) {
+  return request({
+    url: '/aqgl/yxkjzygl/update',
+    method: 'post',
+    data: query||{}
+  })
+}
+export function doAdd(query) {
+  return request({
+    url: '/aqgl/yxkjzygl/add',
+    method: 'post',
+    data: query||{}
+  })
+}
+export function doDelete(query) {
+  return request({
+    url: '/aqgl/yxkjzygl/delete',
+    method: 'post',
+    data: query||{}
+  })
+}
+
+
+export function doQuerytree(query) {
+  return request({
+    url: '/aqgl/yxkjzygl/query/tree',
+    method: 'post',
+    data: query||{}
+  })
+}

src/router/index.js

@@ -488,19 +488,19 @@ export const powerRoutes=[
     redirect: 'maintainTV',
     meta: {title: "三违管理", icon: "fa-cog", noCache: false, link: null,mkid:904000000},
     children: [
-      {
-       component:'threeViolations/homePage/index',
-       hidden:false,
-       meta:{
-           "title": "首页",
-           "icon": "",
-           "noCache": false,
-           "link": null,
-           "mkid":'test',
-       },
-       name:'homePage',
-       path:"homePage"
-      },
+      // {
+      //  component:'threeViolations/homePage/oldIndex',
+      //  hidden:false,
+      //  meta:{
+      //      "title": "首页",
+      //      "icon": "",
+      //      "noCache": false,
+      //      "link": null,
+      //      "mkid":'test',
+      //  },
+      //  name:'homePage',
+      //  path:"homePage"
+      // },
       {
        component:'threeViolations/maintainTV/index',
        hidden:false,
@@ -1426,6 +1426,30 @@ export const powerRoutes=[
         path:"archives"
        }
     ]
+  },
+  /* 有限空间作业*/
+  {
+    path: '/spaceOperations',
+    component: 'Layout',
+    hidden: false,
+    alwaysShow:true,
+    redirect: 'declare',
+    meta: {title: "有限空间作业", icon: "fa-cog", noCache: false, link: null,mkid:905000000},
+    children: [
+      {
+        component:'spaceOperations/declare/index',
+        hidden:false,
+        meta:{
+            "title": "外协单位准入申报",
+            "icon": "",
+            "noCache": false,
+            "link": null,
+            "mkid":905002000,
+        },
+        name:'declare',
+        path:"declare"
+       }
+    ]
   }
 ]
 // 公共路由

src/views/spaceOperations/declare/lessEdit.vue

+<template>
+  <RelDialog :type='type' :editApp='editApp' :app='app' :buttonApp='buttonApp'>
+    <!-- 填写表单内容，slot=form必写-->
+    <el-form slot="form" ref="form" :model="form" label-width="80px" :rules="rules">
+      <el-row :gutter="20">
+        <el-col :span="24">
+          <el-form-item label="标题"  ref="title" prop="title">
+            <el-input :readonly="readonly"   v-model="form.title"></el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
+
+    </el-form>
+  </RelDialog>
+</template>
+<script>
+  import {editMixin} from 'common'
+  export default {
+    mixins: [editMixin],
+    /* 存放index页面传递的额外参数*/
+    mounted() {
+     // this.form.mlid=this.app.queryParams.mlid
+      this.form.gsid=this.app.queryParams.gsid
+    },
+    /* 组件名称*/
+    name: 'appVersionEdit',
+    /* 传递props模式一样必填，用于index,button,REdialog之间的组件通信*/
+
+    data() {
+      return {
+
+        /* 额外初始化，根据需求*/
+        systemType: [],
+
+        /* 当前表单初始值，默认由RelDialog查询indexQuery赋值，copy时不赋值id，初始化时所有query的值都会赋值给form*/
+        form: {
+          mlid:'',
+          gsid:'',
+          title: '',
+          sytk: '',
+          bz: "",
+          fbrq:new Date().getTime(),
+          ssrq:new Date().getTime(),
+          mlid:''
+        },
+        /* form提交时的规则,具体规则参考官网*/
+        rules: {
+          gsid: [{
+              required: true,
+          }, ],
+        }
+      }
+    },
+    methods: {
+      /* 重写方法，this.app来调用index页面定义的api*/
+
+    }
+  }
+</script>
+
+<style scoped lang="scss">
+
+</style>

src/views/threeViolations/homePage/old.vue

@@ -15,7 +15,7 @@
                   <el-tooltip :content="`${item.gsName}${item.bzName||''}:${item.wzr}:${item.wzxw}`" placement="top">
                     <span class='infor'  >
                      {{`${item.gsName}${item.bzName||''}的${item.wzr}做出违章行为:${item.wzxw}`}}
-  
+
                     </span>
                   </el-tooltip>
                 </div>
@@ -45,7 +45,7 @@
                   <el-tooltip :content="`${item.gsName}${item.userName||''}:${item.bytitle}:${item.bycont}`" placement="top">
                     <span class='infor'  >
                      {{`${item.gsName}${item.bzName||''}的${item.userName}:${item.bytitle}`}}
-  
+
                     </span>
                   </el-tooltip>
                 </div>
@@ -70,16 +70,16 @@
             </div>
             <div class="ztcxxx">
             <div class="search-item" style="padding-left: 20px;border-bottom: 2px solid #eee;">
-  
+
               <el-radio v-model="queryParams1.rwlx" label="D">日任务</el-radio>
                <el-radio v-model="queryParams1.rwlx" label="W">周任务</el-radio>
               <el-radio v-model="queryParams1.rwlx" label="M">月任务</el-radio>
             </div>
-  
+
             </div>
             <!-- 图表-->
             <div id="fxpcChart" class="chart" >
-  
+
             </div>
           </div>
           <div class="top_right_yhhz">
@@ -87,26 +87,26 @@
               隐患处理完成率
             </div>
             <div class="ztcxxx" style="padding-left: 0px;" >
-  
+
            <div class="search-item" style="border-bottom: 2px solid #eee;padding-left: 10px;" >
                <RelSelect style="width: 200px;margin-right: 10px;" hasValue  src='jcsj/common/bm/queryGs'  filterable  :match="{value:'id',label:'bmmc'}" v-model='queryParams1.gsid' ></RelSelect>
             <!-- <el-radio v-model="queryParams2.hzfs" label="GS">按公司</el-radio>
               <el-radio v-model="queryParams2.hzfs" label="BM">按班组</el-radio>
               <el-radio v-model="queryParams2.hzfs" label="RY">按人员</el-radio> -->
-  
-  
+
+
             </div>
-  
+
             </div>
             <div id="yhclChart" class="chart" >
-  
+
             </div>
           </div>
       </div>
       <!-- 隐患率-->
-  
+
       <!-- 风险率-->
-  
+
     </div>
     <div class="bottom">
       <div class="zttitle">
@@ -118,11 +118,11 @@
           </TablePager>
       </div>
     </div>
-  
+
   </div>
-  
+
   </template>
-  
+
   <script>
     const baseurl=process.env.VUE_APP_BASE_API
     import {
@@ -137,11 +137,11 @@
     import {
         queryYhsbtj as doQueryyh
     } from "@/api/dangerManagement/yhslhz.js";
-  
+
     import {
         doQuery as doQueryDcl
     } from "@/api/dangerManagement/enterSafetyRecords.js"
-  
+
     import {
         queryBglxFile
     } from  '@/api/threeViolations/enterTV.js';
@@ -151,7 +151,7 @@
      import ryqno from '@/assets/images/ryqno.png'
     export default{
       components: {
-  
+
           vueSeamlessScroll
         },
       mixins: [tableMixin],
@@ -193,8 +193,8 @@
         this.fxpcChart=echarts.init(document.getElementById('fxpcChart'))
         this.yhclChart=echarts.init(document.getElementById('yhclChart'))
         this.$nextTick(()=>{
-  
-  
+
+
           // this.setChart(this.yhclChart,{
           //   name:'隐患整改完成率',
           //   title:'隐患整改'
@@ -225,8 +225,8 @@
               // }},
               // {label: "整改说明", prop: "clff", fieldType: "ftString",width:300},
               //  {label: "整改完成时间", prop: "clsj", fieldType: "ftDateTime"},
-  
-  
+
+
                   {label: "发现日期", prop: "fxrq", fieldType: "ftDateTime"},
               /* */
               {label: "整改日期", prop: "clsj", fieldType: "ftDateTime"},
@@ -274,10 +274,10 @@
             gsid:'',
             // ksrq:new Date(new Date().setHours(0, 0, 0, 0)).getTime(),
             // jsrq:new Date(new Date().setHours(23,59,59,999)).getTime()
-  
+
             ksrq:new Date().getTime(),
             jsrq:new Date().getTime()
-  
+
           },
           queryParams2:{
             hzfs:'GS',
@@ -285,7 +285,7 @@
             ksrq:null,
             jsrq:new Date().getTime()
             // jsrq:new Date(new Date().setHours(23,59,59,999)).getTime()
-  
+
           },
           queryParams:{
             queryType:'YHWCL'
@@ -298,7 +298,7 @@
           /* dom*/
           fxpcChart:null,
           yhclChart:null,
-  
+
         }
       },
       methods:{
@@ -331,7 +331,7 @@
                   title:'风险排查',
                   value:value
                 })
-  
+
             }
           })
         },
@@ -366,7 +366,7 @@
                   title:'隐患整改',
                   value:value
                 })
-  
+
             }
           })
         },
@@ -377,7 +377,7 @@
             tooltip: {
               formatter: '{a} <br/>{b} : {c}%'
             },
-  
+
             series: [
               {
                  axisLine: {
@@ -406,7 +406,7 @@
                   textStyle:{
                     fontSize:17
                   }
-  
+
                 },
                 data: [
                   {
@@ -420,11 +420,11 @@
           /* 渲染dom*/
          chartDom.setOption(option)
         }
-  
+
       }
     }
   </script>
-  
+
   <style lang="scss" scope>
     .listf{
       float: right;
@@ -471,12 +471,12 @@
     border-left: 5px solid #eee;
     border-right: 5px solid #eee;
   }
-  
+
   .homePage{
   width: 35%;
   height: 100%;
-  
-  
+
+
   }
   .nodata{
     background-image: url('/src/assets/image/aq.svg');
@@ -512,9 +512,8 @@
     .el-carousel__item:nth-child(2n) {
       background-color: #99a9bf;
     }
-  
+
     .el-carousel__item:nth-child(2n+1) {
       background-color: #d3dce6;
     }
   </style>
-  
\ No newline at end of file