Home Explore Help
Register Sign In
web
/
ibms
6
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

style

zhulizhen 5 years ago
parent
ea7e729ec5
commit
f7945d344e
9 changed files with 94 additions and 40 deletions
Split View Show Diff Stats
  1. 1 1
      index.html
  2. 4 2
      src/components/data_admin/buildData/style.scss
  3. 1 0
      src/components/data_admin/drag.vue
  4. 24 7
      src/components/ledger/handsontables/assets.vue
  5. 25 8
      src/components/ledger/handsontables/device.vue
  6. 25 8
      src/components/ledger/handsontables/system.vue
  7. 11 11
      src/views/data_admin/buildData/index.vue
  8. 2 2
      src/views/data_admin/buildGraphy/lib/lookImages.vue
  9. 1 1
      src/views/data_admin/buildGraphy/lib/uploadFiles.vue

+ 1 - 1
index.html
View File 

@@ -4,7 +4,7 @@
 
 <head>
 
     <meta charset="utf-8" />
 
     <meta name="viewport" content="width=device-width,initial-scale=1.0" />
 
-    <link rel="stylesheet" type="text/css" href="//at.alicdn.com/t/font_1112731_mlnvbky5ghl.css">
 
+    <link rel="stylesheet" type="text/css" href="//at.alicdn.com/t/font_1112731_tq1523n9oo.css">
 
     <title>sagacloud-admin</title>
 
 </head>

+ 4 - 2
src/components/data_admin/buildData/style.scss
View File 

@@ -64,7 +64,7 @@ h3 {
 
         left: 20px;
 
     }
 
     img::after {
 
-        content: "icon";
 
+        content: "";
 
         // font-family: "iconfont" !important;
 
         font-style: normal;
 
         -webkit-font-smoothing: antialiased;
 
@@ -208,7 +208,7 @@ h3 {
 
         }
 
     }
 
     .label_show {
 
-        height: 35px;
 
+        height: 44px;
 
         margin-top: 0;
 
         text-align: center;
 
         border: 1px solid #DCDFE6;
 
@@ -219,6 +219,7 @@ h3 {
 
         height: 3rem;
 
         line-height: 3rem;
 
         margin-top: 30px;
 
+        margin-bottom: 10px;
 
         width: 100%;
 
         // border: 1px solid #DCDFE6;
 
         // padding-left: 20px;
 
@@ -367,6 +368,7 @@ h3 {
 
     }
 
     .modification {
 
         .el-dialog__body {
 
+            height: 100%;
 
             .mod_title {
 
                 max-height: 8rem;
 
                 .qr_code,

+ 1 - 0
src/components/data_admin/drag.vue
View File 

@@ -74,6 +74,7 @@
 
         font-size: 15px;
 
         cursor: pointer;
 
         float: right;
 
+        margin-right: 23px;
 
       }
 
     }
 
     main{

+ 24 - 7
src/components/ledger/handsontables/assets.vue
View File 

@@ -18,34 +18,44 @@
 
       <div style="width:200px;color:gray;float:right;font-size:12px;">
 
         <span v-if="!onlyRead">隐藏自动填充的信息点:</span>
 
         <el-tooltip v-if="!onlyRead" :content="'' + (isWatch ? '隐藏' : '不隐藏')" placement="top">
 
-          <el-switch
 
+           <el-checkbox v-model="isWatch"  @change="changeWatch"></el-checkbox>
 
+          <!-- <el-switch
 
             @change="changeWatch"
 
             v-model="isWatch"
 
             active-color="#13ce66"
 
             inactive-color="gray"
 
-          ></el-switch>
 
+          ></el-switch> -->
 
         </el-tooltip>
 
         <span v-if="onlyRead">只看要采集的信息</span>
 
         <el-tooltip v-if="onlyRead" :content="'' + (allMess ? '部分' : '全集')" placement="top">
 
-          <el-switch
 
+          <el-checkbox v-model="allMess"  @change="changeWatch"></el-checkbox>
 
+          <!-- <el-switch
 
             @change="changeWatch"
 
             v-model="allMess"
 
             active-color="#13ce66"
 
             inactive-color="gray"
 
-          ></el-switch>
 
+          ></el-switch> -->
 
         </el-tooltip>
 
       </div>
 
       <div
 
-        style="width:90px;cursor: pointer;color:gray;float:right; font-size:10px;"
 
+        style="width:100px;cursor: pointer;float:right; font-size:14px;margin-right:10px"
 
       >
 
-        <p v-if="onlyRead" @click="changeRead">
 
+      <el-select v-model="onlyRead" @click="changeRead">
 
+        <el-option
 
+          v-for="item in options"
 
+          :key="item.value"
 
+          :label="item.label"
 
+          :value="item.value">
 
+        </el-option>
 
+      </el-select>
 
+        <!-- <p v-if="onlyRead" @click="changeRead">
 
           <i class="iconfont icon-yulan"></i>
 
           <span>只读模式</span>
 
         </p>
 
         <p v-else @click="changeRead">
 
           <i class="iconfont icon-yulan"></i>
 
           <span>编辑模式</span>
 
-        </p>
 
+        </p> -->
 
       </div>
 
     </div>
 
     <qrcode :qrcodeUrl="qrcodeUrl" :dialog="dialog" :addBody="true" ref="qrcode"></qrcode>
 
@@ -167,6 +177,13 @@ export default {
 
     },
 
   data() {
 
     return {
 
+      options: [{
 
+          value: true,
 
+          label: '只读模式'
 
+        }, {
 
+          value: false,
 
+          label: '编辑模式'
 
+        }],
 
       main: [],
 
       mess: {},
 
       headers: null,

+ 25 - 8
src/components/ledger/handsontables/device.vue
View File 

@@ -17,34 +17,44 @@
 
       <div style="width:200px;color:gray;float:right;font-size:12px;">
 
         <span v-if="!onlyRead">隐藏自动填充的信息点:</span>
 
         <el-tooltip v-if="!onlyRead" :content="'' + (isWatch ? '隐藏' : '不隐藏')" placement="top">
 
-          <el-switch
 
+             <el-checkbox v-model="isWatch"  @change="changeWatch"></el-checkbox>
 
+          <!-- <el-switch
 
             @change="changeWatch"
 
             v-model="isWatch"
 
             active-color="#13ce66"
 
             inactive-color="gray"
 
-          ></el-switch>
 
+          ></el-switch> -->
 
         </el-tooltip>
 
         <span v-if="onlyRead">只看要采集的信息</span>
 
         <el-tooltip v-if="onlyRead" :content="'' + (allMess ? '部分' : '全集')" placement="top">
 
-          <el-switch
 
+            <el-checkbox v-model="allMess"  @change="changeWatch"></el-checkbox>
 
+          <!-- <el-switch
 
             @change="changeWatch"
 
             v-model="allMess"
 
             active-color="#13ce66"
 
             inactive-color="gray"
 
-          ></el-switch>
 
+          ></el-switch> -->
 
         </el-tooltip>
 
       </div>
 
-      <div
 
-        style="width:90px;cursor: pointer;color:gray;float:right; font-size:10px;"
 
+        <div
 
+        style="width:100px;cursor: pointer;float:right; font-size:14px;margin-right:10px"
 
       >
 
-        <p v-if="onlyRead" @click="changeRead">
 
+      <el-select v-model="onlyRead" @click="changeRead">
 
+        <el-option
 
+          v-for="item in options"
 
+          :key="item.value"
 
+          :label="item.label"
 
+          :value="item.value">
 
+        </el-option>
 
+      </el-select>
 
+        <!-- <p v-if="onlyRead" @click="changeRead">
 
           <i class="iconfont icon-yulan"></i>
 
           <span>只读模式</span>
 
         </p>
 
         <p v-else @click="changeRead">
 
           <i class="iconfont icon-yulan"></i>
 
           <span>编辑模式</span>
 
-        </p>
 
+        </p> -->
 
       </div>
 
     </div>
 
     <!-- 二维码弹窗 -->
 
@@ -176,6 +186,13 @@ export default {
 
   },
 
   data() {
 
     return {
 
+       options: [{
 
+          value: true,
 
+          label: '只读模式'
 
+        }, {
 
+          value: false,
 
+          label: '编辑模式'
 
+        }],
 
       main: [],
 
       mess: {},
 
       headers: null,

+ 25 - 8
src/components/ledger/handsontables/system.vue
View File 

@@ -10,34 +10,44 @@
 
       <div style="width:200px;color:gray;float:right;font-size:10px;">
 
         <span v-if="!onlyRead">隐藏自动填充的信息点:</span>
 
         <el-tooltip v-if="!onlyRead" :content="'' + (isWatch ? '隐藏' : '不隐藏')" placement="top">
 
-          <el-switch
 
+           <el-checkbox v-model="isWatch"  @change="changeWatch"></el-checkbox>
 
+          <!-- <el-switch
 
             @change="changeWatch"
 
             v-model="isWatch"
 
             active-color="#13ce66"
 
             inactive-color="gray"
 
-          ></el-switch>
 
+          ></el-switch> -->
 
         </el-tooltip>
 
         <span v-if="onlyRead">只看要采集的信息</span>
 
         <el-tooltip v-if="onlyRead" :content="'' + (allMess ? '部分' : '全集')" placement="top">
 
-          <el-switch
 
+           <el-checkbox v-model="allMess"  @change="changeWatch"></el-checkbox>
 
+          <!-- <el-switch
 
             @change="changeWatch"
 
             v-model="allMess"
 
             active-color="#13ce66"
 
             inactive-color="gray"
 
-          ></el-switch>
 
+          ></el-switch> -->
 
         </el-tooltip>
 
       </div>
 
-      <div
 
-        style="width:90px;cursor: pointer;color:gray;float:right; font-size:12px;"
 
+        <div
 
+        style="width:100px;cursor: pointer;float:right; font-size:14px;margin-right:10px"
 
       >
 
-        <p v-if="onlyRead" @click="changeRead">
 
+      <el-select v-model="onlyRead" @click="changeRead">
 
+        <el-option
 
+          v-for="item in options"
 
+          :key="item.value"
 
+          :label="item.label"
 
+          :value="item.value">
 
+        </el-option>
 
+      </el-select>
 
+        <!-- <p v-if="onlyRead" @click="changeRead">
 
           <i class="iconfont icon-yulan"></i>
 
           <span>只读模式</span>
 
         </p>
 
         <p v-else @click="changeRead">
 
           <i class="iconfont icon-yulan"></i>
 
           <span>编辑模式</span>
 
-        </p>
 
+        </p> -->
 
       </div>
 
     </div>
 
     <qrcode :dialog="dialog" :addBody="true" ref="qrcode"></qrcode>
 
@@ -148,6 +158,13 @@ export default {
 
     },
 
   data() {
 
     return {
 
+       options: [{
 
+          value: true,
 
+          label: '只读模式'
 
+        }, {
 
+          value: false,
 
+          label: '编辑模式'
 
+        }],
 
       main: [],
 
       mess: {},
 
       headers: null,

+ 11 - 11
src/views/data_admin/buildData/index.vue
View File 

@@ -195,7 +195,7 @@
 
                     <div>
 
                         <div class="mod_title">
 
                             <div class="qr_code">
 
-                                <img v-if="pointList.PointId" :src="'api/ScanBuilding/service/qrcode/point?projectId=' + projectId + '&pointId=' + pointList.PointId + '&FloorId=' + floorId + '&width=200&height=200'" alt>
 
+                                <img v-if="pointList.PointId" :src="'/ScanBuilding/service/qrcode/point?projectId=' + projectId + '&pointId=' + pointList.PointId + '&FloorId=' + floorId + '&width=200&height=200'" alt>
 
                                 <p v-else>暂无二维码</p>
 
                             </div>
 
                             <!-- 头部信息 -->
 
@@ -239,43 +239,43 @@
 
                                             <i class="iconfont icon-shuaxin icon" @click.stop="changeImage(index)"></i>
 
                                         </li>
 
                                         <li v-for="(item,index) in imgList.nameplate" v-if="imgList.nameplate.length" class="img_view">
 
-                                            <img @click="seeBig(item.key,item.name,item.type)" :src="'image-service/common/image_get?systemId=dataPlatform&key='+ item.key +'&width=200'" alt>
 
+                                            <img @click="seeBig(item.key,item.name,item.type)" :src="'/image-service/common/image_get?systemId=dataPlatform&key='+ item.key +'&width=200'" alt>
 
                                             <i class="iconfont icon-shuaxin icon" @click.stop="changeImage(index)"></i>
 
                                         </li>
 
                                         <li v-for="(item,index) in imgList.ahead" v-if="imgList.ahead.length" class="img_view">
 
-                                            <img @click="seeBig(item.key,item.name,item.type)" :src="'image-service/common/image_get?systemId=dataPlatform&key='+ item.key +'&width=200'" alt>
 
+                                            <img @click="seeBig(item.key,item.name,item.type)" :src="'/image-service/common/image_get?systemId=dataPlatform&key='+ item.key +'&width=200'" alt>
 
                                             <i class="iconfont icon-shuaxin icon" @click.stop="changeImage(index)"></i>
 
                                         </li>
 
                                         <li v-for="(item,index) in imgList.qrCodeLooger" v-if="imgList.qrCodeLooger.length" class="img_view">
 
-                                            <img @click="seeBig(item.key,item.name,item.type)" :src="'image-service/common/image_get?systemId=dataPlatform&key='+ item.key +'&width=200'" alt>
 
+                                            <img @click="seeBig(item.key,item.name,item.type)" :src="'/image-service/common/image_get?systemId=dataPlatform&key='+ item.key +'&width=200'" alt>
 
                                             <i class="iconfont icon-shuaxin icon" @click.stop="changeImage(index)"></i>
 
                                         </li>
 
                                         <li v-for="(item,index) in imgList.left" v-if="imgList.left.length" class="img_view">
 
-                                            <img @click="seeBig(item.key,item.name,item.type)" :src="'image-service/common/image_get?systemId=dataPlatform&key='+ item.key +'&width=200'" alt>
 
+                                            <img @click="seeBig(item.key,item.name,item.type)" :src="'/image-service/common/image_get?systemId=dataPlatform&key='+ item.key +'&width=200'" alt>
 
                                             <i class="iconfont icon-shuaxin icon" @click.stop="changeImage(index)"></i>
 
                                         </li>
 
                                         <li v-for="(item,index) in imgList.right" v-if="imgList.right.length" class="img_view">
 
-                                            <img @click="seeBig(item.key,item.name,item.type)" :src="'image-service/common/image_get?systemId=dataPlatform&key='+ item.key +'&width=200'" alt>
 
+                                            <img @click="seeBig(item.key,item.name,item.type)" :src="'/image-service/common/image_get?systemId=dataPlatform&key='+ item.key +'&width=200'" alt>
 
                                             <i class="iconfont icon-shuaxin icon" @click.stop="changeImage(index)"></i>
 
                                         </li>
 
                                         <li v-for="(item,index) in imgList.bottom" v-if="imgList.bottom.length" class="img_view">
 
-                                            <img @click="seeBig(item.key,item.name,item.type)" :src="'image-service/common/image_get?systemId=dataPlatform&key='+ item.key +'&width=200'" alt>
 
+                                            <img @click="seeBig(item.key,item.name,item.type)" :src="'/image-service/common/image_get?systemId=dataPlatform&key='+ item.key +'&width=200'" alt>
 
                                             <i class="iconfont icon-shuaxin icon" @click.stop="changeImage(index)"></i>
 
                                         </li>
 
                                         <li v-for="(item,index) in imgList.qrCode" v-if="imgList.qrCode.length" class="img_view">
 
-                                            <img @click="seeBig(item.key,item.name,item.type)" :src="'image-service/common/image_get?systemId=dataPlatform&key='+ item.key +'&width=200'" alt>
 
+                                            <img @click="seeBig(item.key,item.name,item.type)" :src="'/image-service/common/image_get?systemId=dataPlatform&key='+ item.key +'&width=200'" alt>
 
                                             <i class="iconfont icon-shuaxin icon" @click.stop="changeImage(index)"></i>
 
                                         </li>
 
                                         <li v-for="(item,index) in imgList.panorama" v-if="imgList.panorama.length" class="img_view">
 
-                                            <img @click="seeBig(item.key,item.name,item.type)" :src="'image-service/common/image_get?systemId=dataPlatform&key='+ item.key +'&width=200'" alt>
 
+                                            <img @click="seeBig(item.key,item.name,item.type)" :src="'/image-service/common/image_get?systemId=dataPlatform&key='+ item.key +'&width=200'" alt>
 
                                             <i class="iconfont icon-shuaxin icon" @click.stop="changeImage(index)"></i>
 
                                         </li>
 
                                         <li v-for="(item,index) in imgList.else" v-if="imgList.else.length && item.type != 'image_video'" class="img_view">
 
-                                            <img @click="seeBig(item.key,item.name,item.type)" :src="'image-service/common/image_get?systemId=dataPlatform&key='+ item.key +'&width=200'" alt>
 
+                                            <img @click="seeBig(item.key,item.name,item.type)" :src="'/buildMsgShowimage-service/common/image_get?systemId=dataPlatform&key='+ item.key +'&width=200'" alt>
 
                                             <i class="iconfont icon-shuaxin icon" @click.stop="changeImage(index)"></i>
 
                                         </li>
 
                                         <li v-for="item in imgList.video" style="border: 1px solid #ccc;">
 
-                                            <video style="width:100%;height:100%;" :src="'image-service/common/file_get/'+ item.key + '?systemId=dataPlatform'" controls :poster="'image-service/common/image_get?systemId=dataPlatform&key='+ delVideo(item.key) +'&width=200'"></video>
 
+                                            <video style="width:100%;height:100%;" :src="'/image-service/common/file_get/'+ item.key + '?systemId=dataPlatform'" controls :poster="'image-service/common/image_get?systemId=dataPlatform&key='+ delVideo(item.key) +'&width=200'"></video>
 
                                         </li>
 
                                     </ul>
 
                                 </div>

+ 2 - 2
src/views/data_admin/buildGraphy/lib/lookImages.vue
View File 

@@ -40,9 +40,9 @@
 
                 width="100%"
 
                 height="100%"
 
                 :src="
 
-                '/img/image-service/common/image_get?systemId=dataPlatform&key='+item.key"
 
+                '/image-service/common/image_get?systemId=dataPlatform&key='+item.key"
 
                 controls
 
-                :poster="'img/image-service/common/image_get?systemId=dataPlatform&key='+ item.key +'&width=200'"
 
+                :poster="'/image-service/common/image_get?systemId=dataPlatform&key='+ item.key +'&width=200'"
 
               ></video>
 
             </div>
 
           </div>

+ 1 - 1
src/views/data_admin/buildGraphy/lib/uploadFiles.vue
View File 

@@ -140,7 +140,7 @@ export default {
 
             /* method */
 
             "POST",
 
             /* target url */
 
-            "/img/image-service/common/file_upload?systemId=dataPlatform&secret=9e0891a7a8c8e885&overwrite=true" + key
 
+            "/image-service/common/file_upload?systemId=dataPlatform&secret=9e0891a7a8c8e885&overwrite=true" + key
 
             /*, async, default to true */
 
           );
 
           //xhr.overrideMimeType("application/octet-stream");