页面联调

66c59dc1 · huangwensu · 814d2c95 · 66c59dc1 · 66c59dc1 · 66c59dc1
--- a/package-lock.json
+++ b/package-lock.json
@@ -8956,6 +8956,22 @@
      "integrity": "sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==",
      "optional": true
    },
+    "v-viewer": {
+      "version": "1.5.1",
+      "resolved": "http://192.168.110.93:4873/v-viewer/-/v-viewer-1.5.1.tgz",
+      "integrity": "sha512-Q5ICKzmYQD0qTf+hti2Lhgy6UYY2zgFr+YrN9a3yPgr7pOjYrG405Pz4+6Z6FXlhdhGysCWFJUNCI2tsIyvjWQ==",
+      "requires": {
+        "throttle-debounce": "^2.0.1",
+        "viewerjs": "^1.5.0"
+      },
+      "dependencies": {
+        "throttle-debounce": {
+          "version": "2.3.0",
+          "resolved": "http://192.168.110.93:4873/throttle-debounce/-/throttle-debounce-2.3.0.tgz",
+          "integrity": "sha1-/TGGXmZQIHHkEYF+JBRls+nDcuI="
+        }
+      }
+    },
    "validate-npm-package-license": {
      "version": "3.0.3",
      "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.3.tgz",
@@ -8989,6 +9005,11 @@
        "extsprintf": "^1.2.0"
      }
    },
+    "viewerjs": {
+      "version": "1.9.0",
+      "resolved": "http://192.168.110.93:4873/viewerjs/-/viewerjs-1.9.0.tgz",
+      "integrity": "sha1-bfr1REDDsvdpG4Vma6bSdwjtlZI="
+    },
    "vm-browserify": {
      "version": "0.0.4",
      "resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-0.0.4.tgz",

--- a/package.json
+++ b/package.json
@@ -18,6 +18,7 @@
        "fabric": "^4.3.0",
        "file-saver": "^2.0.5",
        "tui-image-editor": "^3.11.0",
+        "v-viewer": "^1.5.1",
        "vue": "^2.3.2",
        "vue-core-image-upload": "2.1.11",
        "vue-datasource": "1.0.9",

--- a/src/main.js
+++ b/src/main.js
@@ -8,7 +8,7 @@ import ElementUI from 'element-ui';
 import 'element-ui/lib/theme-chalk/index.css';    // 默认主题
 import {getAddress, loadCommonFilter} from './common/env'
 import vueFilter from './common/filter';
-
+import vViewer from 'v-viewer';


 //加载环境变量
@@ -16,6 +16,9 @@ getAddress();
 loadCommonFilter();
 //加载elementUi
 Vue.use(ElementUI);
+Vue.use(vViewer, {
+	button: false
+});
 // Vue.use(vueXlsxTable, {rABS: false})

 if (localStorage.getItem("token")) {

--- a/src/views/strack-data/create-point.vue
+++ b/src/views/strack-data/create-point.vue
@@ -5,7 +5,12 @@
            <el-row :gutter="30" class="row search" type="flex" style="margin-bottom:0;">
                <el-col :span="15">
                    <el-form-item label="">
-                        <el-input v-model="searchParam.action" clearable placeholder="请输入要查找的埋点编码或名称" style="width:400px;margin-left: -74px;"></el-input>
+                        <el-input 
+                        v-model="searchParam.action" 
+                        clearable 
+                        placeholder="请输入要查找的埋点编码或名称" 
+                        style="width:400px;margin-left: -74px;"
+                        @change="search(1)"></el-input>
                    </el-form-item>
                </el-col>
            </el-row>
@@ -103,7 +108,7 @@
            <el-table-column prop="releaseTime" label="发布时间" min-width="100" align="left"></el-table-column>
            <el-table-column prop="img" label="图例" min-width="100" align="left">
                <template slot-scope="scope">
-                    <img :src="scope.row.actionPath" style="width: 80px;"/>
+                    <img :src="scope.row.actionPath" style="width: 80px;" v-viewer/>
                </template>
            </el-table-column>
            <el-table-column prop="handlerName" label="当前处理人" min-width="100" align="left"></el-table-column>
@@ -112,7 +117,7 @@
                <template slot-scope="scope">
                    <el-button :disabled="scope.row.assignBtnStatus == 2" type="primary" size="small" @click="assignDialog(scope.row)">指派</el-button>
                    <el-button :disabled="scope.row.editBtnStatus == 2" type="primary" size="small" @click="editColumn(scope.row)">编辑</el-button>
-                    <el-button :disabled="scope.row.offLineBtnStatus != 2" type="primary" size="small" @click="downPage(scope.row)">下线</el-button>
+                    <el-button :disabled="scope.row.offLineBtnStatus == 2" type="primary" size="small" @click="downPage(scope.row)">下线</el-button>
                    <el-button type="primary" size="small" @click="detail(scope.row)">查看</el-button>
                </template>
            </el-table-column>
@@ -239,6 +244,7 @@
                                v-model="item.tagCode" 
                                clearable 
                                placeholder="请选择额外投递"
+                                @change="changeTag"
                                style="width:200px; margin-bottom: 10px;">
                                    <el-option
                                    v-for="(eItem,eIndex) in tagSelect"
@@ -336,15 +342,42 @@
                        </el-form-item>
                        <div v-for="(item, index) in detailForm.actionTagResqs" :key="index" style="width: 400px;">
                            <el-form-item :label="'额外投递' + parseInt(index + 1)">
-                                <span>投递名称：{{item.name}}</span>
-                                <span>投递编码：{{item.code}}</span>
-                                <span>内容定义：{{item.desc}}</span>
+                                <div>投递名称：{{item.tagName}}</div>
+                                <div>投递编码：{{item.tagCode}}</div>
+                                <div>内容定义：{{item.tagDesc}}</div>
                            </el-form-item>
                        </div>
                    </el-col>
                </el-form>
            </el-row>
        </el-dialog>
+        <!-- 新增投递对象 -->
+        <el-dialog
+            title="新建投递对象"
+            :visible.sync="tagVisible"
+            width="30%">
+            <el-row :gutter="30" class="row search" type="flex" style="margin-bottom:0;">
+                <el-form ref="tagForm" 
+                :model="tagForm"
+                label-width="150px"
+                label-suffix=":"
+                label-position="right"
+                size="mini">
+                    <el-col :span="20">
+                        <el-form-item label="投递对象名" prop="">
+                            <el-input v-model="tagForm.tagName"></el-input>
+                        </el-form-item>
+                        <el-form-item label="投递方法定义" prop="member">
+                            <el-input v-model="tagForm.tagDesc"></el-input>
+                        </el-form-item>
+                    </el-col>
+                </el-form>
+            </el-row>
+            <span slot="footer" class="dialog-footer">
+                <el-button @click="tagVisible = false">取 消</el-button>
+                <el-button type="primary" @click="confirmAddTag">确 定</el-button>
+            </span>
+        </el-dialog>
    </div>
 </template>
 <script>
@@ -352,6 +385,7 @@ import { isEmptyUtils, openLoading, closeLoading } from '../../common/utils';
 export default {
    data() {
        return {
+            tagVisible: false,
            startTime: '',
            endTime: '',
            tableText: '',
@@ -368,6 +402,11 @@ export default {
                pageNo: 1,
                pageSize: 15
            },
+            tagForm: {
+               tagName: '',
+               tagCode: '',
+               tagDesc: ''
+           },
            totalRows: 0,
            dialogVisible: false,
            downPageVisible: false,
@@ -461,6 +500,24 @@ export default {
                "get", `/basic-data/bi/actionTag/list`, {},
                res => {
                    this.tagSelect = res.data;
+                    this.tagSelect.unshift({
+                        tagName: '新建额外投递对象+',
+                        tagCode: '000000'
+                    })
+                }
+            );
+        },
+        changeTag(val, index) {
+            if(val == '000000') {
+                this.tagVisible = true;
+                this.dialogVisible = false;
+            }
+        },
+        confirmAddTag() {
+            this.getData(
+                "post", `/basic-data/bi/actionTag/insert`, this.tagForm,
+                res => {
+                    this.tagVisible = false;
                }
            );
        },

--- a/src/views/strack-data/strack-list.vue
+++ b/src/views/strack-data/strack-list.vue