Ver código fonte

Merge branch 'develop' of http://39.106.8.246:3003/web/wanda-bm-guide into develop

fujunwen 4 anos atrás
pai
commit
d208e0b687

+ 3 - 3
package.json

@@ -12,10 +12,10 @@
     "dependencies": {
         "@mapbox/geojson-merge": "^1.1.1",
         "@saga-web/base": "2.1.25",
-        "@saga-web/big": "1.0.105",
+        "@saga-web/big": "1.0.107",
         "@saga-web/draw": "2.1.106",
-        "@saga-web/feng-map": "1.0.35",
-        "@saga-web/graph": "2.1.121",
+        "@saga-web/feng-map": "1.0.37",
+        "@saga-web/graph": "2.1.123",
         "ant-design-vue": "^1.4.10",
         "axios": "^0.19.2",
         "core-js": "^3.4.4",

+ 1 - 1
public/index.html

@@ -18,7 +18,7 @@
     <link rel="stylesheet" href="<%= BASE_URL %>indexLoading.css" type="text/css">
 
     <!-- 万达置顶条 -->
-    <script src="https://cdn.bootcss.com/jquery/3.4.1/jquery.js"></script>
+    <!-- <script src="https://cdn.bootcss.com/jquery/3.4.1/jquery.js"></script> -->
     <!-- 生产环境 -->
     <link rel="stylesheet" href="http://sso.wanda.cn/Styles/floatMenu.css" type="text/css">
     <script src="http://sso.wanda.cn/Scripts/common.js" type="text/javascript"></script>

+ 26 - 0
src/components/floorMap/index.vue

@@ -290,6 +290,9 @@ export default {
             if (floor == 'g80') {
                 // 屋顶
                 if (window.fengmapData.frImg) {
+                    // const pj = this.urlMsg.fmapID.split('_')[0]
+                    // // 单张图片
+                    // if (!ProjectRf[pj]) {
                         let imgItem = new SImageItem(null, `${this.mapServerURL}/webtheme/${this.fmapID}/${window.fengmapData.frImg}`)
                         imgItem.showType = SImageShowType.AutoFit
                         imgItem.connect('imgLoadOver', this, () => {
@@ -298,6 +301,29 @@ export default {
                         this.scene.addItem(imgItem)
                         this.view.scene = this.scene
                     // this.view.fitSceneToView()
+                    // } else {
+                    //   // 多张图
+                    //   try {
+                    //     // 初始化0
+                    //     this.count = 0;
+                    //     ProjectRf[pj].forEach(t => {
+                    //       const item = new SImageItem(
+                    //         null,
+                    //         `${this.mapServerURL}/webtheme/${this.urlMsg.fmapID}/${t.name}`
+                    //       );
+                    //       item.width = t.width
+                    //       item.height = t.height
+                    //       item.moveTo(t.x, t.y)
+                    //       item.connect("imgLoadOver", this, () => {
+                    //         this.countRf(ProjectRf[pj].length);
+                    //       });
+                    //       this.scene.addItem(item);
+                    //     })
+                    //     this.view.scene = this.scene;
+                    //   } catch(e) {
+                    //     console.log(e);
+                    //   }
+                    // }
                 } else {
                     // 屋顶图不为图片
                     this.readBaseMap(floor)

+ 1 - 1
src/router/index.js

@@ -126,7 +126,7 @@ router.beforeEach(async (to, from, next) => {
             // 有token 将数据 isPreview赋给 vuex方便取值
             store.commit('SETISPREVIEW', sessionStorage.getItem("SETISPREVIEW"))
             // 如果在跳转获取token之前保存了指定的路径,则后去token后需要跳转到相关页面
-            console.log(to.path)
+
             if(to.path !='/group' && to.path !='/home/homepage' && to.path !='/' ){
                 if(!store.state.permissions || store.state.permissions.length ==0){
                     // 如果没有请求permissions则请求getUserInfo

+ 12 - 21
src/store/index.js

@@ -14,9 +14,9 @@ import router from '../router'
 Vue.use(Vuex)
 export default new Vuex.Store({
     state: {
-        ssoToken: 'admin:liulin34',
+        // ssoToken: 'admin:liujiandong',
         // ssoToken: '',
-        // ssoToken: null,
+        ssoToken: null,
         plazaName: "",
         isPreview: false,
         lastRoute: '',
@@ -191,14 +191,17 @@ export default new Vuex.Store({
                 })
                 .then((res) => {
                     // 获取用户当前权限
-                    console.log(res.result)
                     if (res.result === 'success') {
+                        // 如果用户没有权限则跳入404
+                        if(!res.permissions || !res.permissions.includes('GLSMS_VIEW')){
+                            router.push({
+                                path: '/404',
+                            })
+                        }
                         commit('STOREACCESSLEVEL', res.level)
                         commit('SETAUTHMSG', res)
                         let level = res.level
-                        console.log('window.opener', window.opener)
                         if (window.opener && window.opener.__fromGroupPage) {
-                            console.log('window.openerxxx', window.opener)
                             commit('SETAUTHMSG', level)
                             let data = window.opener.__fromGroupPage
                             level = data.level
@@ -209,7 +212,6 @@ export default new Vuex.Store({
                                 path: './home/homepage',
                             })
                         } else {
-                            console.log('window.openerxxx', window.opener, level)
                             if (level == 0) {
                                 if (res.treeData[0].ccode) {
                                     localStorage.setItem('PLAZAID', res.treeData[0].ccode)
@@ -230,15 +232,11 @@ export default new Vuex.Store({
                         }
                         //   给oA头添加名称
                         // 指定条问题
-                        window.wd_fm_info = {
-                            profile: {
-                                username: encodeURIComponent(res.username),
-                            },
-                        }
+                        document.getElementById("wd-fm-id-fm-switch-profile").style.display= 'inline-block';
+                        document.getElementById("wd-fm-id-fm-switch-profile").innerText ='您好,'+ res.username;
                     }
                 })
                 .catch((err) => {
-                    console.log('getuserfo catch', this.getters.accessLevel);
                     // 由于跨域做的判断
                     if (this.getters.accessLevel == 0) {
                         router.push({
@@ -258,19 +256,12 @@ export default new Vuex.Store({
                     if (res.result === 'success') {
                         // commit('STOREACCESSLEVEL', res.level)
                         commit('SETAUTHMSG', res)
-                        window.wd_fm_info = {
-                            profile: {
-                                username: encodeURIComponent(res.username),
-                            },
-                        }
+                        document.getElementById("wd-fm-id-fm-switch-profile").style.display= 'inline-block';
+                        document.getElementById("wd-fm-id-fm-switch-profile").innerText ='您好,'+ res.username;
                     }
                 })
                 .catch((err) => {
                     console.log('getuserfo catch', err)
-                    // router.push({
-                    //     path: '/404',
-                    // })
-                    // commit('SETISREQUESTtAUTH', err)
                 })
         },
         async getFloors(context) {

+ 1 - 1
src/views/analysis/CoreDeviceReport.vue

@@ -221,7 +221,7 @@ export default {
       isClickAccessory: false, // 是否点击的是附件
       accessoryList: [], // 附件
       accessoryPos: {
-        top: 0, 
+        top: 0,
         left: 0
       }, // 附件弹窗位置
     };

+ 157 - 119
src/views/other/zhsxDialog.vue

@@ -1,141 +1,179 @@
 <template>
-    <div class='zhsx-log'>
-        <el-dialog title='综合记录事项' width='70%' :visible.sync='visible'>
-            <div class='top'></div>
-            <div class='bottom'>
-                <p>1.各级政府部门在广场检查中口头及书面提出的工作要求,整改事项</p>
-                <p>2.广场消防安全培训、消防演习</p>
-                <p>3.相关政府强制性检测的按时完成情况及检测中提出的问题</p>
-                <p>4.广场安全质量第三方检测过程中列出的整改事项</p>
-                <div class='bottom-table' :style='`height:${height}`'>
-                    <el-table
-                        :data='tableData'
-                        :height='tableHeight'
-                        style='width:100%;'
-                        :span-method='objectSpanMethod'
-                        border
-                        v-if='tableData.length>0'
-                    >
-                        <el-table-column label='序号' type='index' width='60'></el-table-column>
-                        <el-table-column prop='jcsx' label='检测事项' :show-overflow-tooltip='true' width='400'></el-table-column>
-                        <el-table-column prop='zgbm' label='主管部门' :show-overflow-tooltip='true'></el-table-column>
-                        <el-table-column prop='jlsx' label='记录事项' :show-overflow-tooltip='true'></el-table-column>
-                    </el-table>
-                </div>
-            </div>
-        </el-dialog>
-    </div>
+  <div class="zhsx-log">
+    <el-dialog title="综合记录事项" width="70%" :visible.sync="visible">
+      <div class="top"></div>
+      <div class="bottom">
+        <p>1.各级政府部门在广场检查中口头及书面提出的工作要求,整改事项</p>
+        <p>2.广场消防安全培训、消防演习</p>
+        <p>3.相关政府强制性检测的按时完成情况及检测中提出的问题</p>
+        <p>4.广场安全质量第三方检测过程中列出的整改事项</p>
+        <div class="bottom-table" :style="`height:${height}`">
+          <el-table
+            :data="tableData"
+            :height="tableHeight"
+            style="width:100%;"
+            :span-method="objectSpanMethod"
+            border
+            v-if="tableData.length>0"
+          >
+            <el-table-column label="序号"  prop="num" width="60"></el-table-column>
+            <el-table-column prop="jcsx" label="检测事项" :show-overflow-tooltip="true" width="400"></el-table-column>
+            <el-table-column prop="zgbm" label="主管部门" :show-overflow-tooltip="true"></el-table-column>
+            <el-table-column prop="jlsx" label="记录事项" :show-overflow-tooltip="true"></el-table-column>
+          </el-table>
+        </div>
+      </div>
+    </el-dialog>
+  </div>
 </template>
 <script>
 export default {
-    props: ['tableData'],
-    data() {
-        return {
-            visible: false
-        }
+  props: ["tableData"],
+  data() {
+    return {
+      visible: false
+    };
+  },
+  computed: {
+    tableHeight() {
+      if (window.screen.height <= 768) {
+        return 350;
+      } else {
+        return 440;
+      }
     },
-    computed: {
-        tableHeight() {
-            if (window.screen.height <= 768) {
-                return 350
-            } else {
-                return 440
-            }
-        },
-        height() {
-            if (window.screen.height <= 768) {
-                return 300
-            } else {
-                return 400
-            }
-        }
+    height() {
+      if (window.screen.height <= 768) {
+        return 300;
+      } else {
+        return 400;
+      }
+    },
+    // tableDataNumber() {
+    //   let arr = [];
+    //   let num = 1;
+    //   this.tableData.forEach((item, index) => {
+    //     arr.push(num)
+    //     const text = this.tableData[index]['jcsx'];
+    //    for(var i=arr.length;i<=this.tableData.length;i++){
+
+    //        if(this.tableData[i]['jcsx'] && (this.tableData[i]['jcsx'] == text)){
+    //          arr.push(num)
+    //        }
+    //     }
+    //     num = num + 1;
+    //   });
+    //   console.log("arr", arr);
+    //   return arr;
+    // }
+  },
+  methods: {
+    open() {
+      this.visible = true;
     },
-    methods: {
-        open() {
-            this.visible = true
-        },
-        /**
-         * @name objectSpanMethod
-         * @param { Object } row        当前行
-         * @param { Object } column     当前列
-         * @param {  Number } rowIndex   当前行号
-         * @param { Number } columnIndex    当前列号
-         * @return { Array,Object }
-         * @description 通过给table传入span-method方法可以实现合并行或列,方法的参数是一个对象,
-         * 里面包含当前行row、当前列column、当前行号rowIndex、当前列号columnIndex四个属性。
-         * 该函数可以返回一个包含两个元素的数组,第一个元素代表rowspan,
-         * 第二个元素代表colspan。 也可以返回一个键名为rowspan和colspan的对象。
-         */
-        objectSpanMethod({ row, column, rowIndex, columnIndex }) {
-            // 取出 tableData的长度, 合并记录事项 表格 使用
-            let { length } = this.tableData || 1
-            if (columnIndex === 2) {
-                if (rowIndex > 0 && row[column.property] === this.tableData[rowIndex - 1][column.property]) {
-                    return {
-                        rowspan: 0,
-                        colspan: 0
-                    }
-                } else {
-                    let rows = 1
-                    for (let i = rowIndex; i < this.tableData.length - 1; i++) {
-                        if (row[column.property] === this.tableData[i + 1][column.property]) {
-                            rows++
-                        }
-                    }
-                    return {
-                        rowspan: rows,
-                        colspan: 1
-                    }
-                }
-            } else if (columnIndex === 3) {
-                // 记录事项表格合并
-                return { rowspan: length, colspan: 1 }
+    /**
+     * @name objectSpanMethod
+     * @param { Object } row        当前行
+     * @param { Object } column     当前列
+     * @param {  Number } rowIndex   当前行号
+     * @param { Number } columnIndex    当前列号
+     * @return { Array,Object }
+     * @description 通过给table传入span-method方法可以实现合并行或列,方法的参数是一个对象,
+     * 里面包含当前行row、当前列column、当前行号rowIndex、当前列号columnIndex四个属性。
+     * 该函数可以返回一个包含两个元素的数组,第一个元素代表rowspan,
+     * 第二个元素代表colspan。 也可以返回一个键名为rowspan和colspan的对象。
+     */
+    objectSpanMethod({ row, column, rowIndex, columnIndex }) {
+      // 取出 tableData的长度, 合并记录事项 表格 使用
+      let { length } = this.tableData || 1;
+      if (columnIndex === 2) {
+        if (
+          rowIndex > 0 &&
+          row[column.property] === this.tableData[rowIndex - 1][column.property]
+        ) {
+          return {
+            rowspan: 0,
+            colspan: 0
+          };
+        } else {
+          let rows = 1;
+          for (let i = rowIndex; i < this.tableData.length - 1; i++) {
+            if (
+              row[column.property] === this.tableData[i + 1][column.property]
+            ) {
+              rows++;
             }
+          }
+          return {
+            rowspan: rows,
+            colspan: 1
+          };
+        }
+      } else if (columnIndex === 3) {
+        // 记录事项表格合并
+        return { rowspan: length, colspan: 1 };
+      } else if (columnIndex === 1) {
+        let rows = 1;
+        for (let i = rowIndex; i < this.tableData.length - 1; i++) {
+          if (row[column.property] === this.tableData[i + 1][column.property]) {
+            rows++;
+          }
         }
+        return { rowspan: rows, colspan: 1 };
+      } else if (columnIndex === 0) {
+        let rows = 1;
+        for (let i = rowIndex; i < this.tableData.length - 1; i++) {
+          if (row["jcsx"] == this.tableData[i + 1]["jcsx"]) {
+            rows++;
+          }
+        }
+        return { rowspan: rows, colspan: 1 };
+      }
     }
-}
+  }
+};
 </script>
 <style lang="less" scoped>
 .top {
-    width: 100%;
-    height: 1px;
-    background: rgba(0, 0, 0, 0.06);
-    margin-bottom: 20px;
+  width: 100%;
+  height: 1px;
+  background: rgba(0, 0, 0, 0.06);
+  margin-bottom: 20px;
 }
 .bottom {
-    padding: 0 30px 14px 30px;
-    p {
-        font-size: 14px;
-        font-family: PingFangSC-Regular, PingFang SC;
-        font-weight: 400;
-        color: rgba(96, 106, 120, 1);
-        line-height: 22px;
-    }
-    .bottom-table {
-        margin-top: 12px;
-        // element-ui table 组件 记录事项样式修改, 换行,fixed到页面中部
-        /deep/ .el-table__row:first-child {
-            td:last-child {
-                div {
-                    white-space: pre-wrap;
-                    word-wrap: break-word;
-                    word-break: break-all;
-                    position: fixed;
-                    top: 50%;
-                    transform: translateY(-50%);
-                }
-            }
+  padding: 0 30px 14px 30px;
+  p {
+    font-size: 14px;
+    font-family: PingFangSC-Regular, PingFang SC;
+    font-weight: 400;
+    color: rgba(96, 106, 120, 1);
+    line-height: 22px;
+  }
+  .bottom-table {
+    margin-top: 12px;
+    // element-ui table 组件 记录事项样式修改, 换行,fixed到页面中部
+    /deep/ .el-table__row:first-child {
+      td:last-child {
+        div {
+          white-space: pre-wrap;
+          word-wrap: break-word;
+          word-break: break-all;
+          position: fixed;
+          top: 50%;
+          transform: translateY(-50%);
         }
+      }
     }
+  }
 }
 </style>
 <style lang="less">
 .zhsx-log {
-    .el-dialog {
-        margin-top: 10vh !important;
-    }
-    .el-dialog__wrapper {
-        overflow: hidden;
-    }
+  .el-dialog {
+    margin-top: 10vh !important;
+  }
+  .el-dialog__wrapper {
+    overflow: hidden;
+  }
 }
 </style>

+ 196 - 166
src/views/other/zhsxOther.vue

@@ -1,188 +1,218 @@
 <!-- 综合事项记录 -->
 <template>
-    <div class='zhsx-box'>
-        <div class='zhsx-top'>
-            <div>
-                <el-tabs v-model='activeName' @tab-click='handleClick'>
-                    <el-tab-pane v-for='(item,index) in everySystem' :key='index' :label='`${item.label}`' :name='`${item.type}`'>
-                        <!-- 综合记录事项 -->
-                        <div v-if='item.type==1'>
-                            <zhsx-other-table1 ref='tableZhsx1'></zhsx-other-table1>
-                        </div>
-                        <!-- 第三方检测事项 -->
-                        <div v-if='item.type==2'>
-                            <zhsx-other-table2 ref='tableZhsx2'></zhsx-other-table2>
-                        </div>
-                    </el-tab-pane>
-                </el-tabs>
+  <div class="zhsx-box">
+    <div class="zhsx-top">
+      <div>
+        <el-tabs v-model="activeName" @tab-click="handleClick">
+          <el-tab-pane
+            v-for="(item,index) in everySystem"
+            :key="index"
+            :label="`${item.label}`"
+            :name="`${item.type}`"
+          >
+            <!-- 综合记录事项 -->
+            <div v-if="item.type==1">
+              <zhsx-other-table1 ref="tableZhsx1"></zhsx-other-table1>
             </div>
-            <div class='zhsx-img' @click='zhsxLog'>
-                <img src='../../assets/imgs/zy1.png' alt />
+            <!-- 第三方检测事项 -->
+            <div v-if="item.type==2">
+              <zhsx-other-table2 ref="tableZhsx2"></zhsx-other-table2>
             </div>
-        </div>
-        <zhsx-dialog ref='Dialog' :tableData='tableData'></zhsx-dialog>
+          </el-tab-pane>
+        </el-tabs>
+      </div>
+      <div class="zhsx-img" @click="zhsxLog">
+        <img src="../../assets/imgs/zy1.png" alt />
+      </div>
     </div>
+    <zhsx-dialog ref="Dialog" :tableData="tableData"></zhsx-dialog>
+  </div>
 </template>
 <script>
-import moment from 'moment'
-import { Select } from 'meri-design'
+import moment from "moment";
+import { Select } from "meri-design";
 // import Select from '@/components/Select/Select.vue'
-import ZhsxDialog from './zhsxDialog'
-import zhsxOtherTable1 from './zhsxOtherTable1'
-import zhsxOtherTable2 from './zhsxOtherTable2'
-import { queryZhsxjl } from '@/api/other.js'
+import ZhsxDialog from "./zhsxDialog";
+import zhsxOtherTable1 from "./zhsxOtherTable1";
+import zhsxOtherTable2 from "./zhsxOtherTable2";
+import { queryZhsxjl } from "@/api/other.js";
 export default {
-    data() {
-        return {
-            activeName: '1',
-            tableData: []
-        }
+  data() {
+    return {
+      activeName: "1",
+      tableData: []
+    };
+  },
+  props: ["everySystem"],
+  components: { ZhsxDialog, Select, zhsxOtherTable1, zhsxOtherTable2 },
+  methods: {
+    zhsxLog() {
+      let params = {
+        getParams: {}
+      };
+      queryZhsxjl(params).then(res => {
+        let arr = [];
+        let newdata = this.compIndex(res.data);
+        //console.log('综合事项弹框', res)
+        this.tableData = newdata || [];
+        // 将tableData中的第三项都设置为相同的数据
+        this.tableData.map(item => {
+          arr.push(item.jlsx);
+        });
+        arr = [...new Set(arr)];
+        this.tableData.map(item => {
+          item.jlsx = arr.join("\n\r");
+        });
+      });
+      this.$refs.Dialog.open();
     },
-    props: ['everySystem'],
-    components: { ZhsxDialog, Select, zhsxOtherTable1, zhsxOtherTable2 },
-    methods: {
-        zhsxLog() {
-            let params = {
-                getParams: {}
-            }
-            queryZhsxjl(params).then(res => {
-                let arr = []
-                //console.log('综合事项弹框', res)
-                this.tableData = res.data || []
-                // 将tableData中的第三项都设置为相同的数据
-                this.tableData.map(item => {
-                    arr.push(item.jlsx)
-                })
-                arr = [...new Set(arr)]
-                this.tableData.map(item => {
-                    item.jlsx = arr.join('\n\r')
-                })
-            })
-            this.$refs.Dialog.open()
-        },
-        handleClick(tab) {
-            if (tab.index == '0') {
-                this.$refs.tableZhsx1[0].getZhjl()
-            } else if (tab.index == '1') {
-                this.$refs.tableZhsx2[0].dsfjc()
-            }
+    compIndex(ary) {
+      var res = [];
+      ary.sort();
+      var num = 1;
+      for (var i = 0; i < ary.length; ) {
+        var count = 0;
+        for (var j = i; j < ary.length; j++) {
+          if (ary[i]["jcsx"] == ary[j]["jcsx"]) {
+            count++;
+          }
+        }
+        res.push([ary[i]["jcsx"], num]);
+        num = num + 1;
+        i += count;
+      }
+      for (var i = 0; i < ary.length; i++) {
+        for (var j = 0; j < res.length; j++) {
+          if (ary[i]["jcsx"] == res[j][0]) {
+            ary[i]["num"] = res[j][1];
+          }
         }
+      }
+      return ary
     },
-    mounted() {
-        this.$refs.tableZhsx1[0].getZhjl()
-    }
-}
+    handleClick(tab) {
+      if (tab.index == "0") {
+        this.$refs.tableZhsx1[0].getZhjl();
+      } else if (tab.index == "1") {
+        this.$refs.tableZhsx2[0].dsfjc();
+      }
+    }
+  },
+  mounted() {
+    this.$refs.tableZhsx1[0].getZhjl();
+  }
+};
 </script>
 <style lang="less" scoped>
 .zhsx-box {
-    height: 100%;
-    padding: 66px 50px 38px 50px;
-    .zhsx-top {
-        position: relative;
-        .zhsx-img {
-            position: absolute;
-            width: 16px;
-            height: 16px;
-            left: 260px;
-            top: 3px;
-            img {
-                width: 100%;
-                height: 100%;
-            }
-        }
-        .tab-top {
-            display: flex;
-            align-items: center;
-        }
-    }
+  height: 100%;
+  padding: 66px 50px 38px 50px;
+  .zhsx-top {
+    position: relative;
+    .zhsx-img {
+      position: absolute;
+      width: 16px;
+      height: 16px;
+      left: 260px;
+      top: 3px;
+      img {
+        width: 100%;
+        height: 100%;
+      }
+    }
+    .tab-top {
+      display: flex;
+      align-items: center;
+    }
+  }
 
-    .zhsx-bottom {
-        margin-top: 12px;
-        background: #ffffff;
-        position: relative;
-        padding-bottom: 73px;
-        .footer {
-            height: 32px;
-            display: flex;
-            justify-content: flex-end;
-            margin-top: 28px;
-        }
-    }
+  .zhsx-bottom {
+    margin-top: 12px;
+    background: #ffffff;
+    position: relative;
+    padding-bottom: 73px;
+    .footer {
+      height: 32px;
+      display: flex;
+      justify-content: flex-end;
+      margin-top: 28px;
+    }
+  }
 }
 </style>
 <style lang="less">
 .zhsx-box {
-    .el-dialog__header {
-        padding: 16px 50px;
-    }
-    .el-dialog__title {
-        font-size: 16px;
-        font-family: PingFangSC-Medium, PingFang SC;
-        font-weight: 500;
-        color: rgba(0, 0, 0, 0.85);
-        line-height: 24px;
-    }
-    .el-dialog__body {
-        padding: 0 24px;
-        height: 90%;
-    }
-    .el-tabs--bottom .el-tabs__item.is-bottom:nth-child(2),
-    .el-tabs--bottom .el-tabs__item.is-top:nth-child(2),
-    .el-tabs--top .el-tabs__item.is-bottom:nth-child(2),
-    .el-tabs--top .el-tabs__item.is-top:nth-child(2) {
-        padding-left: 16px;
-    }
-    .el-tabs--bottom .el-tabs__item.is-bottom:last-child,
-    .el-tabs--bottom .el-tabs__item.is-top:last-child,
-    .el-tabs--top .el-tabs__item.is-bottom:last-child,
-    .el-tabs--top .el-tabs__item.is-top:last-child {
-        padding-right: 16px;
-    }
-    .el-tabs__nav-wrap::after {
-        height: 0;
-    }
-    .el-tabs__item {
-        padding: 5px 16px;
-        height: 30px;
-        line-height: 22px;
-        font-size: 14px;
-        font-family: MicrosoftYaHei;
-        color: rgba(31, 36, 41, 1);
-        border: 1px solid rgba(195, 199, 203, 1);
-        background: #fff;
-    }
-    /deep/.el-tabs__item:nth-child(2) {
-        border-radius: 4px 0 0 4px;
-    }
-    /deep/.el-tabs__item:last-child {
-        border-radius: 0 4px 4px 0;
-    }
-    .el-tabs,
-    .el-tabs__content {
-        height: 94%;
-    }
-    .el-tabs__active-bar {
-        background-color: transparent !important;
-    }
-    .is-active {
-        color: #025baa;
-        border-color: #025baa;
-        border-radius: 4px;
-    }
-    .el-tabs__header {
-        margin: 0 0 12px;
-    }
-    .el-table td,
-    .el-table th {
-        padding: 8px 0;
-    }
-    .el-input--suffix .el-input__inner {
-        padding-right: 20px;
-    }
-    @media screen and (max-width: 1366px) {
-        /deep/ .el-table td {
-            padding: 3px 0;
-        }
-    }
+  .el-dialog__header {
+    padding: 16px 50px;
+  }
+  .el-dialog__title {
+    font-size: 16px;
+    font-family: PingFangSC-Medium, PingFang SC;
+    font-weight: 500;
+    color: rgba(0, 0, 0, 0.85);
+    line-height: 24px;
+  }
+  .el-dialog__body {
+    padding: 0 24px;
+    height: 90%;
+  }
+  .el-tabs--bottom .el-tabs__item.is-bottom:nth-child(2),
+  .el-tabs--bottom .el-tabs__item.is-top:nth-child(2),
+  .el-tabs--top .el-tabs__item.is-bottom:nth-child(2),
+  .el-tabs--top .el-tabs__item.is-top:nth-child(2) {
+    padding-left: 16px;
+  }
+  .el-tabs--bottom .el-tabs__item.is-bottom:last-child,
+  .el-tabs--bottom .el-tabs__item.is-top:last-child,
+  .el-tabs--top .el-tabs__item.is-bottom:last-child,
+  .el-tabs--top .el-tabs__item.is-top:last-child {
+    padding-right: 16px;
+  }
+  .el-tabs__nav-wrap::after {
+    height: 0;
+  }
+  .el-tabs__item {
+    padding: 5px 16px;
+    height: 30px;
+    line-height: 22px;
+    font-size: 14px;
+    font-family: MicrosoftYaHei;
+    color: rgba(31, 36, 41, 1);
+    border: 1px solid rgba(195, 199, 203, 1);
+    background: #fff;
+  }
+  /deep/.el-tabs__item:nth-child(2) {
+    border-radius: 4px 0 0 4px;
+  }
+  /deep/.el-tabs__item:last-child {
+    border-radius: 0 4px 4px 0;
+  }
+  .el-tabs,
+  .el-tabs__content {
+    height: 94%;
+  }
+  .el-tabs__active-bar {
+    background-color: transparent !important;
+  }
+  .is-active {
+    color: #025baa;
+    border-color: #025baa;
+    border-radius: 4px;
+  }
+  .el-tabs__header {
+    margin: 0 0 12px;
+  }
+  .el-table td,
+  .el-table th {
+    padding: 8px 0;
+  }
+  .el-input--suffix .el-input__inner {
+    padding-right: 20px;
+  }
+  @media screen and (max-width: 1366px) {
+    /deep/ .el-table td {
+      padding: 3px 0;
+    }
+  }
 }
 </style>

+ 1 - 0
src/views/overview/picModal.vue

@@ -34,6 +34,7 @@ export default {
             this.dialogVisible = true
             this.rotationImg = params
             this.picType = type
+            console.log('params',params)
             if (this.rotationImg.length > 0) {
                 let img = new Image()
                 img.src = this.rotationImg[0].url

+ 2 - 2
vue.config.js

@@ -4,8 +4,8 @@ module.exports = {
         port: 8090,
         proxy: {
             '/data': {
-                target: "http://60.205.177.43",
-                // target: 'http://10.199.143.126',
+                // target: "http://60.205.177.43",
+                target: 'http://10.199.143.126',
                 // target: 'http://192.168.200.11:9003', //yll
                 // target: 'http://localhost:6040/data/',
                 changeOrigin: true,