manage-client 1.22.25-ca → 1.22.26-ca

package/index.html

@@ -1,28 +1,28 @@
-<!DOCTYPE html>
-<html lang="zh-CN">
-<head>
-  <meta charset="utf-8">
-  <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
-  <META HTTP-EQUIV="pragma" CONTENT="no-cache">
-  <META HTTP-EQUIV="Cache-Control" CONTENT="no-cache, must-revalidate">
-  <META HTTP-EQUIV="expires" CONTENT="0">
-  <title>奥枫信息系统</title>
-  <style media="screen">
-    /*url(./static/newmainbg.jpg)*/
-    body {
-      width: 100%;
-      background: #7f8eaf no-repeat center bottom;
-      background-size: cover;
-    }
-
-    body .loginbg {
-      width: 100%;
-      height: 100%;
-      background: url(./static/loginbg.jpg) no-repeat center top;
-    }
-  </style>
-</head>
-<body>
-<app></app>
-</body>
-</html>
+<!DOCTYPE html>
+<html lang="zh-CN">
+<head>
+  <meta charset="utf-8">
+  <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
+  <META HTTP-EQUIV="pragma" CONTENT="no-cache">
+  <META HTTP-EQUIV="Cache-Control" CONTENT="no-cache, must-revalidate">
+  <META HTTP-EQUIV="expires" CONTENT="0">
+  <title>奥枫信息系统</title>
+  <style media="screen">
+    /*url(./static/newmainbg.jpg)*/
+    body {
+      width: 100%;
+      background: #7f8eaf no-repeat center bottom;
+      background-size: cover;
+    }
+
+    body .loginbg {
+      width: 100%;
+      height: 100%;
+      background: url(./static/loginbg.jpg) no-repeat center top;
+    }
+  </style>
+</head>
+<body class="themeOne">
+<app></app>
+</body>
+</html>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "manage-client",
-  "version": "1.22.25-ca",
+  "version": "1.22.26-ca",
   "description": "经营管控模块前台组件",
   "main": "src/index.js",
   "directories": {
@@ -59,7 +59,7 @@
     "sinon-chai": "^2.8.0",
     "style": "0.0.3",
     "style-loader": "^0.20.3",
-    "system-clients": "1.7.6",
+    "system-clients": "1.8.6-ca",
     "url-loader": "^0.5.7",
     "vue-client": "^1.21.1",
     "vue-hot-reload-api": "^1.2.0",

package/src/App.vue

@@ -1,28 +1,28 @@
-<template>
-  <div>
-    <app-base class="bg">
-      <div class='flex'>
-        <article>
-          <!--<route :comp="{name: 'manage-home'}"></route>-->
-          <!--<route :comp="{name: 'meter-reading'}"></route>-->
-          <!--<route :comp="{name: 'Gasproperties'}"></route>-->
-          <!--<route :comp="{name: 'vender-management'}"></route>-->
-          <!--<route :comp="{name: 'malfunction-home'}"></route>-->
-          <route :comp="{name: 'login'}"></route>
-          <!-- <route :comp="{name: 'load-data'}"></route> -->
-          <!-- <route  :comp="{name: 'load-params', props: {componentName: 'login'}}"></route> -->
-          <!-- <route :comp="{name: 'load-params', props: {dataUrl: ['rs/sql/getMeterBrand','rs/sql/getPriceType','rs/sql/getMeterStyle'], componentName: 'login'}}"></route> -->
-        </article>
-      </div>
-    </app-base>
-  </div>
-</template>
-
-<script>
-
-
-export default {
-
-
-}
-</script>
+<template>
+  <div>
+    <app-base class="bg">
+      <div class='flex'>
+        <article>
+          <!--<route :comp="{name: 'manage-home'}"></route>-->
+          <!--<route :comp="{name: 'meter-reading'}"></route>-->
+          <!--<route :comp="{name: 'Gasproperties'}"></route>-->
+          <!--<route :comp="{name: 'vender-management'}"></route>-->
+          <!--<route :comp="{name: 'malfunction-home'}"></route>-->
+          <route :comp="{name: 'login'}"></route>
+          <!-- <route :comp="{name: 'load-data'}"></route> -->
+          <!-- <route  :comp="{name: 'load-params', props: {componentName: 'login'}}"></route> -->
+          <!-- <route :comp="{name: 'load-params', props: {dataUrl: ['rs/sql/getMeterBrand','rs/sql/getPriceType','rs/sql/getMeterStyle'], componentName: 'login'}}"></route> -->
+        </article>
+      </div>
+    </app-base>
+  </div>
+</template>
+
+<script>
+
+
+export default {
+
+
+}
+</script>

package/src/components/MeterManage/MeterMsg.vue

@@ -79,13 +79,13 @@
           <nobr><label type="text" class="form-control mystylecenter" >合同编号:</label></nobr>
         </div>
         <div class="col-xs-4">
-          <label type="text" class="form-control mystylecenter"> {{row.f_contract_id?row.f_contract_id:''}}</label>
+          <label type="text" class="form-control mystylecenter">{{row.f_contract_id?row.f_contract_id:''}}<a @click="showImage('供气合同')" style="float: right">查看图片</a></label>
         </div>
         <div class="col-xs-2">
           <nobr><label type="text" class="form-control mystylecenter" >协议编号:</label></nobr>
         </div>
         <div class="col-xs-4">
-          <label type="text" class="form-control mystylecenter">  {{row.f_safeagreement_id?row.f_safeagreement_id:''}}</label>
+          <label type="text" class="form-control mystylecenter">{{row.f_safeagreement_id?row.f_safeagreement_id:''}}<a @click="showImage('安全协议')" style="float: right">查看图片</a></label>
         </div>
       </div>
       <div class="row">
@@ -214,6 +214,21 @@
     <div class="row" style="margin-top:10px;">
       <button  type="button" class="btn btn-info btn-ln fr"  @click="$parent.$parent.cancel()" >关闭</button>
     </div>
+    <div class="full-img" v-if="show" >
+      <template v-for="(i,row) in images">
+        <img :src="row.downloadurl" v-show="i===index" class="img-state">
+      </template>
+      <div class="btns">
+        <button type="button" name="button" class="btn btn-primary" @click="enlarge()">放大</button>
+        <button type="button" name="button" class="btn btn-primary" @click="reduce()">缩小</button>
+        <button type="button" name="button" class="btn btn-primary" :disabled="index===0" @click="up()">上一个</button>
+        {{ index +1 }} / {{ images.length }}&nbsp;
+        <button type="button" name="button" class="btn btn-primary" :disabled="index===this.images.length" @click="down()" >下一个</button>
+        <button type="button" name="button" class="btn btn-primary" @click="leftRevolve()">向左旋转</button>
+        <button type="button" name="button" class="btn btn-primary" @click="rightRevolve()">向右旋转</button>
+        <button type="button" name="button" class="btn btn-primary" @click="close()" >关闭</button>
+      </div>
+    </div>
   </div>
 </template>
 
@@ -221,6 +236,7 @@
 import vue from 'vue'
 
 import {HttpResetClass} from 'vue-client'
+import $ from "jquery";
 
 export default {
   title: '表具信息',
@@ -231,10 +247,71 @@ export default {
     return {
       model: null,
       row:{},
-      meterInfo:{}
+      meterInfo:{},
+      show: false,
+      images: [],
+      index: 0
     }
   },
   methods: {
+    up(){
+      this.index -= 1
+    },
+    down(){
+      this.index += 1
+    },
+    open () {
+      this.deg = 0
+      this.power = 0.5
+      this.show = true
+    },
+    close () {
+      this.show = false
+    },
+    enlarge () {
+      this.power = 2*this.power
+      this.imgState()
+    },
+    reduce () {
+      this.power = 0.5*this.power
+      this.imgState()
+    },
+    leftRevolve () {
+      this.deg -= 90
+      this.imgState()
+    },
+    rightRevolve () {
+      this.deg += 90
+      this.imgState()
+    },
+    imgState () {
+      $('.img-state').css({
+        'transform': 'rotate(' + this.deg + 'deg) scale(' + this.power + ' ,' + this.power + ')'
+      })
+    },
+    showImage(type){
+      let http = new HttpResetClass()
+      // 如果展示供气合同， 开始查询
+      this.$resetpost('/rs/sql/singleTable_OrderBy',
+        {
+          data:{
+            tablename: "t_check_paper cp LEFT JOIN t_paper_overall_imgs poi ON concat(CP.ID,'') = POI.F_PAPER_ID",
+            orderitem: " f_offsite_time desc",
+            items: " CP.F_CARD_ID, cp.f_offsite_time,  cp.f_checker_name,  POI.TITLE, '/rs/image/file/' || POI.F_OVERALL_PATH downloadurl ",
+            condition: `   CP.F_CARD_ID = '${this.row.f_card_id}' and CP.f_state = '已检' AND ( (  POI.title = '安全协议' AND F_OVERALL_PATH IS NOT NULL ) OR ( POI.title = '供气合同' AND F_OVERALL_PATH IS NOT NULL)) `
+          }
+        },
+        {resolveMsg: null, rejectMsg: null}).then((res) => {
+        this.images = res.data.filter(item => item.title===type)
+        console.log(this.images)
+        if (this.images.length===0){
+           this.$showAlert('暂时没有图片展示','warning',2000)
+           return
+        }
+        this.index = 0
+        this.open()
+      })
+    },
     // 发送请求数据
     search () {
       let http = new HttpResetClass()
@@ -266,7 +343,32 @@ export default {
 }
 </script>
 <style scoped>
-
+.full-img {
+  position: fixed;
+  top: 0;
+  bottom: 0;
+  left: 0;
+  right: 0;
+  z-index: 20;
+  background: rgba(0,0,0,0.8);
+  display: flex;
+  overflow: auto;
+  flex-direction: column;
+  justify-content: center;
+  align-items: center;
+  color: #fff;
+}
+.btns {
+  position: fixed;
+  bottom: 100px;
+  height: auto;
+}
+.btns button {
+  margin-right: 20px;
+}
+.img-state {
+  width: 70%
+}
 .datapanel {
   color: #111;
   background-color: white;

package/src/main.js

@@ -1,29 +1,30 @@
-import Vue from 'vue'
-import App from './App'
-import { all } from 'vue-client'
-import { system } from 'system-clients'
-import saleManage from './saleManage'
-import webmeterManage from './webmeterManage'
-import reportManage from './reportManage'
-import echarts from 'echarts'
-
-
-Vue.config.silent = true
-
-
-/** **************************通用组件******************************/
-require('./bootstrap/less/bootstrap.less')
-require('./expandcss.less')
-Vue.prototype.$echarts = echarts
-all()
-system(false)
-saleManage()
-webmeterManage()
-reportManage()
-
-
-new Vue({
-  el: 'body',
-  components: { App }
-})
-
+import Vue from 'vue'
+import App from './App'
+import { all } from 'vue-client'
+import { system } from 'system-clients'
+import saleManage from './saleManage'
+import webmeterManage from './webmeterManage'
+import reportManage from './reportManage'
+import echarts from 'echarts'
+
+
+Vue.config.silent = true
+
+
+/** **************************通用组件******************************/
+require('./bootstrap/v3less/styles/less/bootstrap.less')
+require('./bootstrap/less/bootstrap.less')
+require('./expandcss.less')
+Vue.prototype.$echarts = echarts
+all()
+system(false)
+saleManage()
+webmeterManage()
+reportManage()
+
+
+new Vue({
+  el: 'body',
+  components: { App }
+})
+