Browse Source

adm:fix> 添加当前版本

shaun-sheep 4 years ago
parent
commit
8f8e20f942

+ 28 - 34
src/components/dialogs/list/batchDialog.vue

@@ -133,30 +133,30 @@
 </template>
 
 <script>
-  import myPagination from "@/components/ledger/lib/myPagination"
-  import tools from "@/utils/buildfloor/tools";
-
-  export default {
-    name: "batchDialog",
-    props: ['firmName', 'allObject', 'page', 'information','newEnclosure'],
-    components: {myPagination},
-    data() {
-      return {
-        form:{},
-        batchDialog: false,//dialog
-        active: 0,//进度条
-        checkAll: false,//全选
-        isIndeterminate: true,
-        checkedCities: [],//选择的项,单项
-        firm: [
-          {
-            name: "生产厂家/品牌型号",
-            code: "DPManufacturerID",
-            num: 2,
-          }, {
-            name: "供应商信息",
-            code: "DPSupplierID",
-            num: 8
+import myPagination from "@/components/ledger/lib/myPagination"
+import tools from "@/utils/buildfloor/tools";
+
+export default {
+  name: "batchDialog",
+  props: ['firmName', 'allObject', 'page', 'information', 'newEnclosure'],
+  components: {myPagination},
+  data() {
+    return {
+      form: {},
+      batchDialog: false,//dialog
+      active: 0,//进度条
+      checkAll: false,//全选
+      isIndeterminate: true,
+      checkedCities: [],//选择的项,单项
+      firm: [
+        {
+          name: "生产厂家/品牌型号",
+          code: "DPManufacturerID",
+          num: 2,
+        }, {
+          name: "供应商信息",
+          code: "DPSupplierID",
+          num: 8
           }, {
             name: "维修商信息",
             code: "DPMaintainerID",
@@ -230,18 +230,11 @@
     },
     filters: {
       filterImgName(value) {
-        if (value && value.length > 16) {
-          return value.substring(0, 12) + '...'
-        } else {
-          return value
-        }
+        return value && value.length > 16 ? value.substring(0, 12) + '...' : value
       } ,
       filterImgNames(value) {
-        if (value && value.length > 16) {
-          return value.substring(0, 16) + '...'
-        } else {
-          return value
-        }
+        return value && value.length > 16 ? value.substring(0, 16) + '...' : value
+
       }
     },
     methods: {
@@ -449,6 +442,7 @@
         this.$emit('getAllData')
       },
       multiple(val) {
+
         this.$emit('multiples',val)
       },
 

+ 68 - 63
src/components/ledger/handsontables/assets.vue

@@ -141,72 +141,72 @@
   </div>
 </template>
 <script>
-  import {
-    BeatchQueryParam,
-    countPartsDie,
-    createPropertys,
-    deleteProperty,
-    getDataDictionary,
-    propertyLinkEq,
-    queryProperty,
-    propertyUpdate,
-    updateProperty
-  } from "@/api/scan/request";
+import {
+  BeatchQueryParam,
+  countPartsDie,
+  createPropertys,
+  deleteProperty,
+  getDataDictionary,
+  propertyLinkEq,
+  propertyUpdate,
+  queryProperty,
+  updateProperty
+} from "@/api/scan/request";
 
-  import tools from "@/utils/scan/tools"
-  import handsonUtils from "@/utils/scan/hasontableUtils"
-  import showTools from "@/utils/handsontable/notShow"
-  import buildFloor from '@/utils/handsontable/buildFloorData'
-  import firm from "@/components/dialogs/list/firm"
-  import supplierDialog from "@/components/dialogs/list/supplierDialog"
-  import uploadFilesDialog from "@/components/dialogs/list/filesDialog"
-  import uploadImgDialog from "@/components/dialogs/list/uploadImgDialog"
-  import maintainerDialog from "@/components/dialogs/list/maintainerDialog"
-  import insurerDialog from "@/components/dialogs/list/insurerDialog"
-  import picDialog from "@/components/dialogs/list/picDialog"
+import tools from "@/utils/scan/tools"
+import handsonUtils from "@/utils/scan/hasontableUtils"
+import showTools from "@/utils/handsontable/notShow"
+import buildFloor from '@/utils/handsontable/buildFloorData'
+import firm from "@/components/dialogs/list/firm"
+import supplierDialog from "@/components/dialogs/list/supplierDialog"
+import uploadFilesDialog from "@/components/dialogs/list/filesDialog"
+import uploadImgDialog from "@/components/dialogs/list/uploadImgDialog"
+import maintainerDialog from "@/components/dialogs/list/maintainerDialog"
+import insurerDialog from "@/components/dialogs/list/insurerDialog"
+import picDialog from "@/components/dialogs/list/picDialog"
 
-  import qrcode from "@/components/business_space/lib/qrcode"
-  // import firm from "@/components/business_space/dialogs/list/firm"
-  import supplyDialog from "@/components/business_space/dialogs/list/supplyDialog"
-  // import supplierDialog from "@/components/business_space/dialogs/list/supplierDialog"
-  // import maintainerDialog from "@/components/business_space/dialogs/list/maintainerDialog"
-  // import insurerDialog from "@/components/business_space/dialogs/list/insurerDialog"
-  import guaranteeDialog from "@/components/business_space/dialogs/list/guaranteeDialog"
-  // import uploadFilesDialog from "@/components/business_space/dialogs/list/filesDialog"
-  // import uploadImgDialog from "@/components/business_space/dialogs/list/uploadImgDialog"
-  // import detailsDialog from "@/components/business_space/lib/detailsDia"
-  // import picDialog from "@/components/business_space/dialogs/list/picDialog"
-  import myPagination from "@/components/common/myPagination"
-  import myCascader from "@/components/ledger/lib/assets"
-  import floorCascader from "@/components/ledger/lib/floorCascader"
-  import dieCascader from "@/components/ledger/lib/partsDieList"
-  import {mapGetters} from "vuex"
-  //图片查看
-  import lookPic from "@/components/ledger/lib/lookImages"
-  import Handsontable from "handsontable-pro"
-  import 'handsontable-pro/dist/handsontable.full.css'
-  import batchDialog from "../../dialogs/list/batchDialog";
-  //下拉插件
-  // import "@/assets/js/chosen.jquery.min";
-  // import "@/assets/js/handsontable-chosen-editor";
+import qrcode from "@/components/business_space/lib/qrcode"
+// import firm from "@/components/business_space/dialogs/list/firm"
+import supplyDialog from "@/components/business_space/dialogs/list/supplyDialog"
+// import supplierDialog from "@/components/business_space/dialogs/list/supplierDialog"
+// import maintainerDialog from "@/components/business_space/dialogs/list/maintainerDialog"
+// import insurerDialog from "@/components/business_space/dialogs/list/insurerDialog"
+import guaranteeDialog from "@/components/business_space/dialogs/list/guaranteeDialog"
+// import uploadFilesDialog from "@/components/business_space/dialogs/list/filesDialog"
+// import uploadImgDialog from "@/components/business_space/dialogs/list/uploadImgDialog"
+// import detailsDialog from "@/components/business_space/lib/detailsDia"
+// import picDialog from "@/components/business_space/dialogs/list/picDialog"
+import myPagination from "@/components/common/myPagination"
+import myCascader from "@/components/ledger/lib/assets"
+import floorCascader from "@/components/ledger/lib/floorCascader"
+import dieCascader from "@/components/ledger/lib/partsDieList"
+import {mapGetters} from "vuex"
+//图片查看
+import lookPic from "@/components/ledger/lib/lookImages"
+import Handsontable from "handsontable-pro"
+import 'handsontable-pro/dist/handsontable.full.css'
+import batchDialog from "../../dialogs/list/batchDialog";
+//下拉插件
+// import "@/assets/js/chosen.jquery.min";
+// import "@/assets/js/handsontable-chosen-editor";
 
-  export default {
-    components: {
-      qrcode, //二维码页面
-      firm, //
-      supplyDialog,
-      supplierDialog,
-      guaranteeDialog,
-      uploadFilesDialog,
-      maintainerDialog,
-      insurerDialog,
-      uploadImgDialog,
-      picDialog,
-      myPagination,
-      // dialogAssets,
-      myCascader,
-      floorCascader,
-      dieCascader,
+export default {
+  components: {
+    qrcode, //二维码页面
+    firm, //
+    supplyDialog,
+    supplierDialog,
+    guaranteeDialog,
+    uploadFilesDialog,
+    maintainerDialog,
+    insurerDialog,
+    uploadImgDialog,
+    picDialog,
+    myPagination,
+    // dialogAssets,
+    myCascader,
+    floorCascader,
+    dieCascader,
       // detailsDialog,
       lookPic,
       batchDialog
@@ -1317,6 +1317,11 @@
       multiples(val) {
         this.firmDataType = 'dialog'
         switch (val) {
+          case 'TechParam.CompleteMachine.DesignIDGraph': //"设计工况空调机组处理过程焓湿图"
+            this.filesArr = this.forValue(this.newEnclosure, val) ? this.forValue(this.newEnclosure, val) : [];
+            this.infoType = val;
+            this.myDialog.uploadFiles = true;
+            break;
           case 'LedgerParam.InsuranceDoc.InsuranceFile': //保险文件
             this.filesArr = this.forValue(this.newEnclosure, val) ? this.forValue(this.newEnclosure, val) : [];
             this.infoType = val;

+ 68 - 50
src/framework/layout/Main.vue

@@ -1,52 +1,56 @@
 <template>
     <div id='page-main' v-bind:class='{"page-sidebar-closed": sidebarClosed}'>
-        <page-header></page-header>
+      <page-header></page-header>
 
-        <div id='page-container' class='page-container'>            
-            <page-sidebar></page-sidebar>            
-            <div id='page-content-wrapper' class='page-content-wrapper'>
-                <div class='page-bar'>
-                    <el-breadcrumb separator='/'>
-                    <el-breadcrumb-item v-show="!breadcrumb.length"  :to='{ path: "/" }'>首页</el-breadcrumb-item>
-                    <el-breadcrumb-item v-show="breadcrumb.length" v-for='(b, index) in breadcrumb' :key='index' :to='b.path ? { path: b.path } : null'>{{b.label}}</el-breadcrumb-item>                       
-                    </el-breadcrumb>
-                </div>
-                <!-- <router-view class='page-content'/> -->
-                <keep-alive>
-                    <router-view v-if='$route.meta.keepAlive' class='page-content'></router-view>
-                </keep-alive>
-                <router-view v-if='!$route.meta.keepAlive' class='page-content'></router-view>
-            </div>
+      <div id='page-container' class='page-container'>
+        <page-sidebar></page-sidebar>
+        <div id='page-content-wrapper' class='page-content-wrapper'>
+          <div class='page-bar'>
+            <el-breadcrumb separator='/'>
+              <el-breadcrumb-item v-show="!breadcrumb.length" :to='{ path: "/" }'>首页</el-breadcrumb-item>
+              <el-breadcrumb-item v-show="breadcrumb.length" v-for='(b, index) in breadcrumb' :key='index'
+                                  :to='b.path ? { path: b.path } : null'>{{ b.label }}
+              </el-breadcrumb-item>
+            </el-breadcrumb>
+          </div>
+          <!-- <router-view class='page-content'/> -->
+          <keep-alive>
+            <router-view v-if='$route.meta.keepAlive' class='page-content'></router-view>
+          </keep-alive>
+          <router-view v-if='!$route.meta.keepAlive' class='page-content'></router-view>
+                <div class="version">当前版本: V4.0.1</div>
         </div>
-        <!-- <div class='page-footer'>
-            © 2016 SAGACLOUD. All rights reserved 京ICP备16059843号-1
-        </div>-->
+      </div>
+      <!--     <div class='page-footer'>-->
+      <!--            © 2016 SAGACLOUD. All rights reserved 京ICP备16059843号-1-->
+      <!--        </div>-->
     </div>
 </template>
 <script>
-import { mapGetters, mapMutations } from 'vuex'
+import {mapGetters, mapMutations} from 'vuex'
 import PageHeader from './PageHeader'
 import PageSidebar from './PageSidebar'
-import menus from '@/data/menus' 
+import menus from '@/data/menus'
+
 export default {
-    name: 'Main',
-    components: {
-        'page-header': PageHeader,
-        'page-sidebar': PageSidebar
-    },
-    props: [],
-    data() {
-        return {
-            isPath:  false
-        }
-    },
-    computed: {
-        ...mapGetters('layout', ['sidebarClosed', 'breadcrumb'])
-    },
-    methods: {
-        ...mapMutations('layout', ['setSidebarClosed','setSidebarSelected']),
-        windwoResize() {
-            // 窗口大小发生变化时
+  name: 'Main',
+  components: {
+    'page-header': PageHeader,
+    'page-sidebar': PageSidebar
+  },
+  props: [],
+  data() {
+    return {
+      isPath: false
+    }
+  },
+  computed: {
+    ...mapGetters('layout', ['sidebarClosed', 'breadcrumb'])
+  },
+  methods: {
+    ...mapMutations('layout', ['setSidebarClosed', 'setSidebarSelected']),
+    windwoResize() {
+      // 窗口大小发生变化时
             let clientWidth = `${document.documentElement.clientWidth}`
             let clientHeight = `${document.documentElement.clientHeight}`
             //this.setPageContentHeight(height)
@@ -71,17 +75,31 @@ export default {
     },
     watch: {
         "$route": {
-            handler: function(route, oldVal){
-                let path = route.path
-                this.isPath = false;
-                this.findPathInArray(menus,path)
-                if(this.isPath) {
-                    this.setSidebarSelected(path)
-                }
-            },
-            // 深度观察监听
-            deep: true
+          handler: function (route, oldVal) {
+            let path = route.path
+            this.isPath = false;
+            this.findPathInArray(menus, path)
+            if (this.isPath) {
+              this.setSidebarSelected(path)
+            }
+          },
+          // 深度观察监听
+          deep: true
         }
     },
 }
-</script>
+</script>
+<style lang="less">
+#page-main {
+
+  .version {
+    order: 2;
+    flex-grow: 0;
+    flex-shrink: 0;
+    height: 15px;
+    line-height: 1.5;
+    text-align: center;
+    color: #6d6d6d;
+  }
+}
+</style>