Kezdőlap Felfedezés Súgó
Bejelentkezés
community
/
dwsurvey-ui
6
0
Másolás 0
Fájlok Problémák 0 Beolvasztási kérések 0 Wiki
Forráskód Böngészése

路由改为hash模式，增加/dw前缀

dygapp 2 éve
szülő
e6a6da09a6
commit
d0c95b46ca
29 módosított fájl, 286 hozzáadás és 74 törlés
Osztott Nézet Diff Statisztika Mutatása
  1. 1 0
      .eslintignore
  2. 3 3
      config/dev.env.js
  3. 4 4
      config/index.js
  4. 1 1
      index.html
  5. BIN
      src/assets/401.gif
  6. 3 3
      src/components/common/DwSurveyDcsWrapper.vue
  7. 1 1
      src/components/layouts/DwHeader.vue
  8. 2 2
      src/components/layouts/DwHeaderLogin.vue
  9. 2 2
      src/components/layouts/LoginLayout.vue
  10. 11 1
      src/router/index.js
  11. 5 4
      src/utils/dw-msg.js
  12. 3 3
      src/views/Login.vue
  13. 4 4
      src/views/dw-survey/DwSurveyList.vue
  14. 5 1
      src/views/dw-survey/dw-collect/DwAnswer.vue
  15. 5 5
      src/views/dw-survey/dw-collect/DwAnswerUrlMain.vue
  16. 6 6
      src/views/dw-survey/dw-collect/DwAnswerWeixin.vue
  17. 1 1
      src/views/dw-survey/dw-collect/DwSiteShare.vue
  18. 96 0
      src/views/error/401.vue
  19. 96 0
      src/views/error/403.vue
  20. 2 2
      static/diaowen/design.html
  21. 2 2
      static/diaowen/js/common/common.js
  22. 4 4
      static/diaowen/js/dw/an/an-pcm-common.js
  23. 3 3
      static/diaowen/js/dw/an/ans-m-data.js
  24. 4 4
      static/diaowen/js/dw/an/ans-p-data.js
  25. 1 1
      static/diaowen/js/dw/an/msg.js
  26. 6 4
      static/diaowen/js/dw/design-data.js
  27. 3 3
      static/diaowen/js/dw/dwsurvey-design.js
  28. 11 9
      static/diaowen/js/dw/preview.js
  29. 1 1
      static/diaowen/message.html

+ 1 - 0
.eslintignore
Fájl Megtekintése 

@@ -3,3 +3,4 @@
 
 /dist/
 
 /*.js
 
 /test/unit/coverage/
 
+/static/

+ 3 - 3
config/dev.env.js
Fájl Megtekintése 

@@ -9,7 +9,7 @@ const prodEnv = require('./prod.env')
 
 module.exports = merge(prodEnv, {
 
   NODE_ENV: '"development"',
 
   // 本地开发环境后端API地址不需要在这个文件配置，在config/index.js里面配置target
 
-  DW_API_URL: '"http://localhost:8081"',//开发环境不需要修改，只需要 config/index.js target
 
-  DW_WEB_URL: '"http://localhost:8081"',//开发环境不需要修改，只需要 config/index.js target
 
-  DW_RESOURCE_URL: '"http://localhost:8080"'
 
+  DW_API_URL: '""',//开发环境不需要修改，只需要 config/index.js target
 
+  DW_WEB_URL: '""',//开发环境不需要修改，只需要 config/index.js target
 
+  DW_RESOURCE_URL: '""'
 
 })

+ 4 - 4
config/index.js
Fájl Megtekintése 

@@ -9,15 +9,15 @@ module.exports = {
 
 
     // Paths
 
     assetsSubDirectory: 'static',
 
-    assetsPublicPath: '/',
 
+    assetsPublicPath: '/dw',
 
     proxyTable: {
 
       '/api': {
 
         target: 'http://dw.cc-lotus.info/',//本地开发环境只需要修改这个配置，修改为后端服务地址即可
 
         changeOrigin: true,//如果需要跨域
 
         pathRewrite: {
 
-                    '^/api': '/api'
 
-                  }
 
+          '^/api': '/api'
 
         }
 
+      },
 
     },
 
     // Various Dev Server settings
 
     // host: 'localhost', // can be overwritten by process.env.HOST
 
@@ -58,7 +58,7 @@ module.exports = {
 
     // Paths
 
     assetsRoot: path.resolve(__dirname, '../dist'),
 
     assetsSubDirectory: 'static',
 
-    assetsPublicPath: '/',
 
+    assetsPublicPath: '/dw',
 
 
     /**
 
      * Source Maps

+ 1 - 1
index.html
Fájl Megtekintése 

@@ -4,7 +4,7 @@
 
     <meta charset="utf-8">
 
     <meta name="viewport" content="width=device-width,initial-scale=1.0">
 
     <link rel="shortcut icon" href="static/diaowen/images/favicon.ico" type="image/x-icon" />
 
-    <title>DWSurvey-调问开源问卷-社区版</title>
 
+    <title>调问问卷</title>
 
   </head>
 
   <body>
 
     <div id="app"></div>

BIN
src/assets/401.gif
Fájl Megtekintése


A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 3 - 3
src/components/common/DwSurveyDcsWrapper.vue


+ 1 - 1
src/components/layouts/DwHeader.vue
Fájl Megtekintése 

@@ -6,7 +6,7 @@
 
           <div class="dw-header-main" >
 
             <el-row type="flex" justify="space-between" align="middle">
 
               <el-col :span="4" >
 
-                <a href="/#/">
 
+                <a href="/dw/#/">
 
                   <el-image :src="require('@/assets/logo.png')" ></el-image>
 
                   <span style="color: #ffa71d;font-size: 14px;position: absolute;margin-left: 10px;">OSS</span>
 
                 </a>

A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 2 - 2
src/components/layouts/DwHeaderLogin.vue


+ 2 - 2
src/components/layouts/LoginLayout.vue
Fájl Megtekintése 

@@ -13,7 +13,7 @@
 
           </el-container>
 
         </el-container>
 
       </el-container>
 
-      <el-footer height="80" class="dw-footer-container"><dw-footer></dw-footer></el-footer>
 
+      <!-- <el-footer height="80" class="dw-footer-container"><dw-footer></dw-footer></el-footer> -->
 
     </el-container>
 
   </div>
 
 </template>
 
@@ -67,7 +67,7 @@ body{
 
   padding-top: 20px;
 
 }
 
 .dw-layout-body{
 
-  background-image: url("/static/diaowen/images/style-model/login_bg/1.jpg");
 
+  background-image: url("/dw/static/diaowen/images/style-model/login_bg/1.jpg");
 
   -moz-background-size: cover;
 
   background-size: cover;
 
   background-repeat: no-repeat;

+ 11 - 1
src/router/index.js
Fájl Megtekintése 

@@ -21,7 +21,7 @@ import Login from '@/views/Login'
 
 Vue.use(Router)
 
 
 export default new Router({
 
-  mode: 'history',
 
+  mode: 'hash',
 
   routes: [
 
     {
 
       path: '/',
 
@@ -117,6 +117,16 @@ export default new Router({
 
           component: Login
 
         }
 
       ]
 
+    },
 
+    {
 
+      path: '/401',
 
+      component: () => import('@/views/error/401'),
 
+      hidden: true
 
+    },
 
+    {
 
+      path: '/403',
 
+      component: () => import('@/views/error/403'),
 
+      hidden: true
 
     }
 
   ]
 
 })

+ 5 - 4
src/utils/dw-msg.js
Fájl Megtekintése 

@@ -16,13 +16,14 @@ export function msgInfo (message) {
 
 }
 
 
 export function msgBoxNoLogin () {
 
-  MessageBox.confirm('未登录状态，是否重新登录', '系统提示', {
 
-    confirmButtonText: '重新登录',
 
+  MessageBox.confirm('未登录状态，禁止访问系统', '系统提示', {
 
+    confirmButtonText: '确定',
 
     cancelButtonText: '取消',
 
     type: 'warning'
 
   }
 
   ).then(() => {
 
-    window.location.href = '/login'
 
+    // window.location.href = '/dw/#/login'
 
+    window.location.href='/dw/#/401'
 
   }).catch(() => {})
 
 }
 
 
@@ -34,6 +35,6 @@ export function msgBoxNoRole () {
 
     type: 'warning'
 
   }
 
   ).then(() => {
 
-    window.location.href = '/#/'
 
+    window.location.href = '/dw/#/'
 
   }).catch(() => {})
 
 }

+ 3 - 3
src/views/Login.vue
Fájl Megtekintése 

@@ -8,7 +8,7 @@
 
             <div>
 
               <el-tag type="success">调问</el-tag>
 
               <el-tag type="warning">专业</el-tag>
 
-              <el-tag>开源</el-tag>
 
+              <!-- <el-tag>开源</el-tag> -->
 
               <el-tag type="success">实用的</el-tag>
 
               <el-tag type="warning">调查问卷系统</el-tag>
 
             </div>
 
@@ -95,9 +95,9 @@ export default {
 
 </script>
 
 
 <style scoped>
 
-#loginPage{
 
+/* #loginPage{*/
 
   /*background-image: url("http://localhost:8181/diaowen/images/style-model/login_bg/1.jpg");*/
 
-}
 
+/* } */
 
 .loginFormContent{
 
   padding: 20px;
 
   margin-top: 50px;

+ 4 - 4
src/views/dw-survey/DwSurveyList.vue
Fájl Megtekintése 

@@ -62,7 +62,7 @@
 
               <template slot-scope="scope">
 
                 <el-button-group>
 
                   <el-tooltip effect="dark" content="编辑问卷" placement="top">
 
-                    <el-button size="mini" content="编辑问卷" icon="el-icon-edit" @click="buttonClickA(`/static/diaowen/design.html?surveyId=${scope.row.id}`)" ></el-button>
 
+                    <el-button size="mini" content="编辑问卷" icon="el-icon-edit" @click="buttonClickA(`/dw/static/diaowen/design.html?surveyId=${scope.row.id}`)" ></el-button>
 
                   </el-tooltip>
 
                   <el-tooltip effect="dark" content="答卷地址" placement="top">
 
                     <el-button size="mini" icon="el-icon-share" @click="handlePush(`/dw/survey/c/url/${scope.row.id}`)"></el-button>
 
@@ -71,7 +71,7 @@
 
                     <el-button size="mini" icon="el-icon-s-data" @click="handlePush(`/dw/survey/d/chart/${scope.row.id}`)"></el-button>
 
                   </el-tooltip>
 
                   <el-tooltip effect="dark" content="预览问卷" placement="top">
 
-                    <el-button size="mini" icon="el-icon-view" @click="buttonClickA(`/static/diaowen/preview.html?surveyId=${scope.row.id}`)"></el-button>
 
+                    <el-button size="mini" icon="el-icon-view" @click="buttonClickA(`/dw/static/diaowen/preview.html?surveyId=${scope.row.id}`)"></el-button>
 
                   </el-tooltip>
 
                   <el-tooltip effect="dark" content="复制问卷" placement="top">
 
                     <el-button size="mini" icon="el-icon-copy-document" @click="handleCopy(scope.$index, scope.row)"></el-button>
 
@@ -209,7 +209,7 @@ export default {
 
         if (httpResult.resultCode === 200) {
 
           this.dialogFormVisible = false
 
           this.$confirm('问卷创建成功，点击“继续编辑问卷”进入问卷编辑。', '系统提示', {confirmButtonText: '继续编辑问卷'}).then(({value}) => {
 
-            window.location.href=`/static/diaowen/design.html?surveyId=${resultData.id}`
 
+            window.location.href=`/dw/static/diaowen/design.html?surveyId=${resultData.id}`
 
           }).catch(() => {
 
             this.queryList(1)
 
           })
 
@@ -225,7 +225,7 @@ export default {
 
         if (httpResult.resultCode === 200) {
 
           this.dialogFormVisible = false
 
           this.$confirm('问卷复制成功，点击“继续编辑问卷”进入问卷编辑。', '系统提示', {confirmButtonText: '继续编辑问卷'}).then(({value}) => {
 
-            window.location.href=`/static/diaowen/design.html?surveyId=${resultData.id}`
 
+            window.location.href=`/dw/static/diaowen/design.html?surveyId=${resultData.id}`
 
           }).catch(() => {
 
             this.queryList(1)
 
           })

+ 5 - 1
src/views/dw-survey/dw-collect/DwAnswer.vue
Fájl Megtekintése 

@@ -12,7 +12,11 @@ export default {
 
     loadAnswer () {
 
       const sid = this.$route.params.sid
 
       const token = this.$route.query.token
 
-      window.location.href=`/static/diaowen/answer-p.html?sid=${sid}&token=${token}`
 
+      if (token) {
 
+        window.location.href=`/dw/static/diaowen/answer-p.html?sid=${sid}&token=${token}`
 
+      } else {
 
+        window.location.href=`/dw/static/diaowen/answer-p.html?sid=${sid}`
 
+      }
 
     }
 
   }
 
 }

+ 5 - 5
src/views/dw-survey/dw-collect/DwAnswerUrlMain.vue
Fájl Megtekintése 

@@ -3,9 +3,9 @@
 
     <div>
 
       <div class="dw-dcs-main-title">
 
         <h4>答卷地址</h4>
 
-        <div class="dw-dcs-main-p">复制下面的问卷链接到QQ，Email等工具中直接发给被用户</div>
 
+        <div class="dw-dcs-main-p">复制下面的问卷链接到信息发布、微信等工具中直接发给被调用户</div>
 
       </div>
 
-      <div class="dw-dcs-main-content">
 
+      <!-- <div class="dw-dcs-main-content">
 
         <div class="dw-dcs-main-title">
 
           <div class="dw-dcs-main-p">简短地址：此地址只支持现代浏览器</div>
 
         </div>
 
@@ -14,7 +14,7 @@
 
           <el-button type="primary" icon="el-icon-copy-document" @click="copyActiveCode($event,survey.answerUrl )" >复制地址</el-button>
 
           <el-link :href="survey.answerUrl" :underline="false" target="_blank" ><el-button icon="el-icon-link" style="border-bottom-left-radius: 0px;border-top-left-radius: 0px;" >打开问卷</el-button></el-link>
 
         </el-button-group>
 
-      </div>
 
+      </div> -->
 
       <div class="dw-dcs-main-content">
 
         <div class="dw-dcs-main-title">
 
           <div class="dw-dcs-main-p">
 
@@ -28,7 +28,7 @@
 
         </el-button-group>
 
       </div>
 
     </div>
 
-    <div>
 
+    <!-- <div>
 
       <div class="dw-dcs-main-title">
 
         <h4>二维码地址</h4>
 
         <div class="dw-dcs-main-p">通过手机扫一扫，或下载二维码，即可进行问卷数据收集。</div>
 
@@ -47,7 +47,7 @@
 
           </el-col>
 
         </el-row>
 
       </div>
 
-    </div>
 
+    </div> -->
 
   </div>
 
 </template>

+ 6 - 6
src/views/dw-survey/dw-collect/DwAnswerWeixin.vue
Fájl Megtekintése 

@@ -33,7 +33,7 @@
 
               <el-row type="flex" gutter="20" justify="start" align="middle">
 
                 <el-col :span="8" >
 
                   <div class="dw-dcs-main-wx-step">1、使用微信扫一扫功能。</div>
 
-                  <el-image src="/static/diaowen/images/img1/weixin_collect1.jpg" class="dw-dcs-main-img">
 
+                  <el-image src="/dw/static/diaowen/images/img1/weixin_collect1.jpg" class="dw-dcs-main-img">
 
                     <div slot="placeholder" class="image-slot">
 
                       加载中<span class="dot">...</span>
 
                     </div>
 
@@ -41,7 +41,7 @@
 
                 </el-col>
 
                 <el-col :span="8">
 
                   <div class="dw-dcs-main-wx-step">2、打开问卷后，点击右上角的“分享”按钮。</div>
 
-                  <el-image src="/static/diaowen/images/img1/weixin_collect2.jpg" class="dw-dcs-main-img">
 
+                  <el-image src="/dw/static/diaowen/images/img1/weixin_collect2.jpg" class="dw-dcs-main-img">
 
                     <div slot="placeholder" class="image-slot">
 
                       加载中<span class="dot">...</span>
 
                     </div>
 
@@ -49,7 +49,7 @@
 
                 </el-col>
 
                 <el-col :span="8">
 
                   <div class="dw-dcs-main-wx-step">3、选择“发送给朋友”或“分享到朋友圈”</div>
 
-                  <el-image src="/static/diaowen/images/img1/weixin_collect3.jpg" class="dw-dcs-main-img">
 
+                  <el-image src="/dw/static/diaowen/images/img1/weixin_collect3.jpg" class="dw-dcs-main-img">
 
                     <div slot="placeholder" class="image-slot">
 
                       加载中<span class="dot">...</span>
 
                     </div>
 
@@ -75,7 +75,7 @@
 
               <el-row type="flex" gutter="20" justify="start" align="top">
 
                 <el-col :span="8" >
 
                   <div class="dw-dcs-main-wx-step">1、打开公众账号。</div>
 
-                  <el-image src="/static/diaowen/images/img1/weixin_b_s3.png" class="dw-dcs-main-img">
 
+                  <el-image src="/dw/static/diaowen/images/img1/weixin_b_s3.png" class="dw-dcs-main-img">
 
                     <div slot="placeholder" class="image-slot">
 
                       加载中<span class="dot">...</span>
 
                     </div>
 
@@ -83,7 +83,7 @@
 
                 </el-col>
 
                 <el-col :span="8">
 
                   <div class="dw-dcs-main-wx-step">2、将链接放入公众号中确认后推送文章。</div>
 
-                  <el-image src="/static/diaowen/images/img1/weixin_b_s4.jpeg" class="dw-dcs-main-img">
 
+                  <el-image src="/dw/static/diaowen/images/img1/weixin_b_s4.jpeg" class="dw-dcs-main-img">
 
                     <div slot="placeholder" class="image-slot">
 
                       加载中<span class="dot">...</span>
 
                     </div>
 
@@ -111,7 +111,7 @@ export default {
 
   },
 
   data () {
 
     return {
 
-      code: 'http://ent.surveyform.cn/#/diaowen/wdhl2uv6e9x',
 
+      code: 'http://ent.surveyform.cn/dw/#/diaowen/wdhl2uv6e9x',
 
       src: 'https://ent.surveyform.cn/api/dwsurvey/anon/response/answerTD.do?surveyId=465d3020-0880-4c37-ab09-cc40869758de'
 
     }
 
   },

+ 1 - 1
src/views/dw-survey/dw-collect/DwSiteShare.vue
Fájl Megtekintése 

@@ -27,7 +27,7 @@ export default {
 
   },
 
   data () {
 
     return {
 
-      code: 'http://ent.surveyform.cn/#/diaowen/wdhl2uv6e9x',
 
+      code: 'http://ent.surveyform.cn/dw/#/diaowen/wdhl2uv6e9x',
 
       src: 'https://ent.surveyform.cn/api/dwsurvey/anon/response/answerTD.do?surveyId=465d3020-0880-4c37-ab09-cc40869758de'
 
     }
 
   },

+ 96 - 0
src/views/error/401.vue
Fájl Megtekintése 

@@ -0,0 +1,96 @@
 
+<template>
 
+  <div class="errPage-container">
 
+    <el-button icon="arrow-left" class="pan-back-btn" @click="back">
 
+      返回
 
+    </el-button>
 
+    <el-row>
 
+      <el-col :span="12">
 
+        <h1 class="text-jumbo text-ginormous">
 
+          401错误!
 
+        </h1>
 
+        <h2>您没有访问权限！</h2>
 
+        <h6>对不起，您没有访问权限，请不要进行非法操作！您可以返回主页面</h6>
 
+        <ul class="list-unstyled">
 
+          <li class="link-type">
 
+            <router-link to="/">
 
+              回首页
 
+            </router-link>
 
+          </li>
 
+        </ul>
 
+      </el-col>
 
+      <el-col :span="12">
 
+        <img :src="errGif" width="313" height="428" alt="Girl has dropped her ice cream.">
 
+      </el-col>
 
+    </el-row>
 
+  </div>
 
+</template>
 
+
 
+<script>
 
+import errGif from '@/assets/401.gif'
 
+
 
+export default {
 
+  name: 'Page401',
 
+  data () {
 
+    return {
 
+      errGif: errGif + '?' + +new Date()
 
+    }
 
+  },
 
+  methods: {
 
+    back () {
 
+      if (this.$route.query.noGoBack) {
 
+        this.$router.push({path: '/'})
 
+      } else {
 
+        this.$router.go(-1)
 
+      }
 
+    }
 
+  }
 
+}
 
+</script>
 
+
 
+<style scoped>
 
+.errPage-container {
 
+  width: 800px;
 
+  max-width: 100%;
 
+  margin: 100px auto;
 
+}
 
+
 
+.pan-back-btn {
 
+  background: #008489;
 
+  color: #fff;
 
+  border: none !important;
 
+}
 
+
 
+.pan-gif {
 
+  margin: 0 auto;
 
+  display: block;
 
+}
 
+
 
+.pan-img {
 
+  display: block;
 
+  margin: 0 auto;
 
+  width: 100%;
 
+}
 
+
 
+.text-jumbo {
 
+  font-size: 60px;
 
+  font-weight: 700;
 
+  color: #484848;
 
+}
 
+
 
+.list-unstyled {
 
+  font-size: 14px;
 
+}
 
+
 
+.list-unstyled li {
 
+  padding-bottom: 5px;
 
+}
 
+
 
+.list-unstyled a {
 
+  color: #008489;
 
+  text-decoration: none;
 
+}
 
+
 
+.list-unstyled a:hover {
 
+  text-decoration: underline;
 
+}
 
+</style>

+ 96 - 0
src/views/error/403.vue
Fájl Megtekintése 

@@ -0,0 +1,96 @@
 
+<template>
 
+  <div class="errPage-container">
 
+    <el-button icon="arrow-left" class="pan-back-btn" @click="back">
 
+      返回
 
+    </el-button>
 
+    <el-row>
 
+      <el-col :span="12">
 
+        <h1 class="text-jumbo text-ginormous">
 
+          403错误!
 
+        </h1>
 
+        <h2>您没有访问权限！</h2>
 
+        <h6>对不起，您没有访问权限，请不要进行非法操作！您可以返回主页面</h6>
 
+        <ul class="list-unstyled">
 
+          <li class="link-type">
 
+            <router-link to="/">
 
+              回首页
 
+            </router-link>
 
+          </li>
 
+        </ul>
 
+      </el-col>
 
+      <el-col :span="12">
 
+        <img :src="errGif" width="313" height="428" alt="Girl has dropped her ice cream.">
 
+      </el-col>
 
+    </el-row>
 
+  </div>
 
+</template>
 
+
 
+<script>
 
+import errGif from '@/assets/401.gif'
 
+
 
+export default {
 
+  name: 'Page401',
 
+  data () {
 
+    return {
 
+      errGif: errGif + '?' + +new Date()
 
+    }
 
+  },
 
+  methods: {
 
+    back () {
 
+      if (this.$route.query.noGoBack) {
 
+        this.$router.push({path: '/'})
 
+      } else {
 
+        this.$router.go(-1)
 
+      }
 
+    }
 
+  }
 
+}
 
+</script>
 
+
 
+<style scoped>
 
+.errPage-container {
 
+  width: 800px;
 
+  max-width: 100%;
 
+  margin: 100px auto;
 
+}
 
+
 
+.pan-back-btn {
 
+  background: #008489;
 
+  color: #fff;
 
+  border: none !important;
 
+}
 
+
 
+.pan-gif {
 
+  margin: 0 auto;
 
+  display: block;
 
+}
 
+
 
+.pan-img {
 
+  display: block;
 
+  margin: 0 auto;
 
+  width: 100%;
 
+}
 
+
 
+.text-jumbo {
 
+  font-size: 60px;
 
+  font-weight: 700;
 
+  color: #484848;
 
+}
 
+
 
+.list-unstyled {
 
+  font-size: 14px;
 
+}
 
+
 
+.list-unstyled li {
 
+  padding-bottom: 5px;
 
+}
 
+
 
+.list-unstyled a {
 
+  color: #008489;
 
+  text-decoration: none;
 
+}
 
+
 
+.list-unstyled a:hover {
 
+  text-decoration: underline;
 
+}
 
+</style>

+ 2 - 2
static/diaowen/design.html
Fájl Megtekintése 

@@ -651,7 +651,7 @@
 
           <div id="contactPersonQuestion" class="tools_item">
 
             <div class="toolbars">
 
               <ul class="dragQuUl">
 
-                <li id="dateQuModel" style="">
 
+                <li id="dateQuModel">
 
                   <div class="dwToolbar_icon"></div>
 
                   <div class="dwQuTypeModel">
 
                     <div class="surveyQuItemBody quDragBody">
 
@@ -714,7 +714,7 @@
 
                     </div>
 
                   </div>
 
                 </li>
 
-                <li id="timeQuModel" style="">
 
+                <li id="timeQuModel">
 
                   <div class="dwToolbar_icon"></div>
 
                   <div class="dwQuTypeModel">
 
                     <div class="surveyQuItemBody quDragBody">

+ 2 - 2
static/diaowen/js/common/common.js
Fájl Megtekintése 

@@ -77,10 +77,10 @@ $(document).ready(function(){
 
       urlParams="&ruleCode="+ruleCode;
 
     }
 
     if(browser.isMobile && pageName==="p"){
 
-      window.location.href="/static/diaowen/answer-m.html?sid="+sid+urlParams;
 
+      window.location.href="/dw/static/diaowen/answer-m.html?sid="+sid+urlParams;
 
     }
 
     if(!browser.isMobile && pageName==="m" ){
 
-      window.location.href="/static/diaowen/answer-p.html?sid="+sid+urlParams;
 
+      window.location.href="/dw/static/diaowen/answer-p.html?sid="+sid+urlParams;
 
     }
 
     if(callback!=null){
 
       callback();

+ 4 - 4
static/diaowen/js/dw/an/an-pcm-common.js
Fájl Megtekintése 

@@ -22,11 +22,11 @@ function checkAnswerSurvey(sid){
 
           }else{
 
             //跳转到详情页
 
             if(ruleCode!=undefined && ruleCode!=""){
 
-              // window.location.href="/#/diaowen-msg-code/"+sid+"/"+answerCheckCode+"/"+ruleCode;
 
-              window.location.href="/static/diaowen/message.html?sid="+sid+"&respType="+answerCheckCode+"&pwdCode="+ruleCode;
 
+              // window.location.href="/dw/#/diaowen-msg-code/"+sid+"/"+answerCheckCode+"/"+ruleCode;
 
+              window.location.href="/dw/static/diaowen/message.html?sid="+sid+"&respType="+answerCheckCode+"&pwdCode="+ruleCode;
 
             }else{
 
-              // window.location.href="/#/diaowen-msg/"+sid+"/"+answerCheckCode;
 
-              window.location.href="/static/diaowen/message.html?sid="+sid+"&respType="+answerCheckCode;
 
+              // window.location.href="/dw/#/diaowen-msg/"+sid+"/"+answerCheckCode;
 
+              window.location.href="/dw/static/diaowen/message.html?sid="+sid+"&respType="+answerCheckCode;
 
             }
 
           }
 
         }

+ 3 - 3
static/diaowen/js/dw/an/ans-m-data.js
Fájl Megtekintése 

@@ -59,8 +59,8 @@ function querySurveyAll(callback) {
 
     error: function(xmlHttpRequest,error){
 
       if(xmlHttpRequest.status===404){
 
         // alert("未找到发布的问卷或问卷未发布，请重新发布"+sid);
 
-        // window.location.href="/#/diaowen-msg/"+sid+"/1";
 
-        window.location.href="/static/diaowen/diaowen-message.html?sid="+sid+"&respType=1";
 
+        // window.location.href="/dw/#/diaowen-msg/"+sid+"/1";
 
+        window.location.href="/dw/static/diaowen/diaowen-message.html?sid="+sid+"&respType=1";
 
       }else if(xmlHttpRequest.status===403){
 
         $("#dwSurveyName").html("<span style='color: red;'>没有权限，无法加载数据！</span>");
 
         $("#dwSurveyNoteEdit").html("加载失败");
 
@@ -73,7 +73,7 @@ function parseSurvey(data){
 
   var tag = $("#tag").val();
 
   if(!(tag==="p" || tag==="s")){
 
     if(data.surveyState!=1){
 
-      window.location.href="/static/diaowen/diaowen-message.html?sid="+data.sid+"&respType=1";
 
+      window.location.href="/dw/static/diaowen/diaowen-message.html?sid="+data.sid+"&respType=1";
 
     }
 
   }
 
   $("#id").val(data.id);

+ 4 - 4
static/diaowen/js/dw/an/ans-p-data.js
Fájl Megtekintése 

@@ -62,8 +62,8 @@ function querySurveyAll(callback) {
 
       // console.debug(error);
 
       if(xmlHttpRequest.status===404){
 
         // alert("未找到发布的问卷或问卷未发布，请重新发布");
 
-        // window.location.href="/#/diaowen-msg/"+sid+"/1";
 
-        // window.location.href="/static/diaowen/diaowen-message.html?sid="+sid+"&respType=1";
 
+        // window.location.href="/dw/#/diaowen-msg/"+sid+"/1";
 
+        // window.location.href="/dw/static/diaowen/diaowen-message.html?sid="+sid+"&respType=1";
 
       }else if(xmlHttpRequest.status===403){
 
         // alert("没有权限");
 
         $("#dwSurveyName").html("<span style='color: red;'>没有权限，无法加载数据！</span>");
 
@@ -76,8 +76,8 @@ function querySurveyAll(callback) {
 
 function parseSurvey(data,tag){
 
   if(tag!="p" && tag!="s") {
 
     if(data.surveyState!=1){
 
-      // window.location.href="/#/diaowen-msg/"+data.sid+"/1";
 
-      // window.location.href="/static/diaowen/diaowen-message.html?sid="+data.sid+"&respType=1";
 
+      // window.location.href="/dw/#/diaowen-msg/"+data.sid+"/1";
 
+      // window.location.href="/dw/static/diaowen/diaowen-message.html?sid="+data.sid+"&respType=1";
 
     }
 
   }
 
   $("#id").val(data.id);

+ 1 - 1
static/diaowen/js/dw/an/msg.js
Fájl Megtekintése 

@@ -22,7 +22,7 @@ function resultStatus2Msg(resptype,sid,ruleCode) {
 
   }else if(resptype==='4'){
 
     tempMsg.resultNote = '验证码不正确，操作未成功!';
 
     tempMsg.resultColor = "#e70f0f";
 
-    setReqUrl({reqUrl:'/static/diaowen/answer-p.html?sid='+sid,urlText:'重新答卷'})
 
+    setReqUrl({reqUrl:'/dw/static/diaowen/answer-p.html?sid='+sid,urlText:'重新答卷'})
 
   }else if(resptype==='5'){
 
     tempMsg.resultNote = '发生未知异常，操作未成功!';
 
     tempMsg.resultColor = "#e70f0f";

+ 6 - 4
static/diaowen/js/dw/design-data.js
Fájl Megtekintése 

@@ -48,17 +48,19 @@ function querySurveyAll(){
 
         // alert("数据获取失败！");
 
         notify(httpResult.resultMsg,10000);
 
         if(httpResult.resultCode===401){
 
-          window.location.href="/login";
 
+          // window.location.href="/dw/#/login";
 
+          window.location.href="/dw/#/401";
 
         }else if(httpResult.resultCode===403){
 
-          window.location.href="/#/403";
 
+          window.location.href="/dw/#/403";
 
         }
 
       }
 
     },
 
     error: function(xmlHttpRequest, textStatus, errorThrown){
 
       if(xmlHttpRequest.status===401){
 
-        window.location.href="/login";
 
+        // window.location.href="/dw/#/login";
 
+        window.location.href="/dw/#/401";
 
       }else if(xmlHttpRequest.status===403){
 
-        window.location.href="/#/403";
 
+        window.location.href="/dw/#/403";
 
       }
 
     }
 
   });

+ 3 - 3
static/diaowen/js/dw/dwsurvey-design.js
Fájl Megtekintése 

@@ -775,7 +775,7 @@ $(document).ready(function(){
 
     resetQuItemHover(null);
 
     saveSurvey(function(){
 
       isSaveProgress=false;
 
-      window.location.href="/static/diaowen/preview.html?surveyId="+questionBelongId;
 
+      window.location.href="/dw/static/diaowen/preview.html?surveyId="+questionBelongId;
 
     });
 
     return false;
 
   });
 
@@ -795,11 +795,11 @@ $(document).ready(function(){
 
 		resetQuItemHover(null);
 
 		saveSurvey(function(){
 
 			isSaveProgress=false;
 
-			window.location.href="/static/diaowen/preview.html?surveyId="+questionBelongId;
 
+			window.location.href="/dw/static/diaowen/preview.html?surveyId="+questionBelongId;
 
 		});
 
 	});
 
 	$("#signOut").click(function(){
 
-		window.location.href="/dw/survey/";
 
+		window.location.href="/dw/#/dw/survey/";
 
 	});
 
 	function saveSurvey(callback){
 
 		isSaveProgress=true;

+ 11 - 9
static/diaowen/js/dw/preview.js
Fájl Megtekintése 

@@ -6,12 +6,12 @@ $(document).ready(function(){
 
   $("#sid").val(sid);
 
   $("#id").val(surveyId);
 
   loadSurveyData(function(){
 
-    $("#surveyList").attr("href","/#/dw/survey");
 
-    $("#designSurvey").attr("href","/static/diaowen/design.html?surveyId="+surveyId);
 
+    $("#surveyList").attr("href","/dw/#/dw/survey");
 
+    $("#designSurvey").attr("href","/dw/static/diaowen/design.html?surveyId="+surveyId);
 
     $("#dwPhone").hide();
 
     $("#dwPad").hide();
 
     var tag = $("#tag").val();
 
-    $("#PcSurvey").attr("src","/static/diaowen/answer-p.html?surveyId="+surveyId+"&sid="+sid+"&tag="+tag);
 
+    $("#PcSurvey").attr("src","/dw/static/diaowen/answer-p.html?surveyId="+surveyId+"&sid="+sid+"&tag="+tag);
 
     bindEvent();
 
     if(template!=null && template==="1"){
 
       $("#editorPreview").hide();
 
@@ -33,9 +33,9 @@ function bindEvent(){
 
     if(thHref==="#dwPc"){
 
 
     }else if(thHref==="#dwPad"){
 
-      $("#PadSurvey").attr("src","/static/diaowen/answer-m.html?surveyId="+surveyId+"&sid="+sid+"&tag="+tag);
 
+      $("#PadSurvey").attr("src","/dw/static/diaowen/answer-m.html?surveyId="+surveyId+"&sid="+sid+"&tag="+tag);
 
     }else if(thHref==="#dwPhone"){
 
-      $("#PhoneSurvey").attr("src","/static/diaowen/answer-m.html?surveyId="+surveyId+"&sid="+sid+"&tag="+tag);
 
+      $("#PhoneSurvey").attr("src","/dw/static/diaowen/answer-m.html?surveyId="+surveyId+"&sid="+sid+"&tag="+tag);
 
     }
 
     $(".dwPreviewBody").hide();
 
     $(thHref).show();
 
@@ -53,7 +53,7 @@ function bindEvent(){
 
       type: "post",
 
       success: function (httpResult){
 
         if(httpResult.resultCode===200){
 
-          window.location.href="/#/dw/survey/c/url/"+surveyId;
 
+          window.location.href="/dw/#/dw/survey/c/url/"+surveyId;
 
         }else{
 
           alert(httpResult.resultMsg);
 
         }
 
@@ -61,10 +61,11 @@ function bindEvent(){
 
       error: function(xmlHttpRequest, textStatus, errorThrown){
 
         // alert(xmlHttpRequest);
 
         if(xmlHttpRequest.status===401){
 
-          window.location.href="/login";
 
+          // window.location.href="/dw/#/login";
 
+          window.location.href="/dw/#/401";
 
         }else if(xmlHttpRequest.status===403){
 
           alert("没有发布权限");
 
-          // window.location.href="/#/exception/403";
 
+          // window.location.href="/dw/#/exception/403";
 
         }
 
       }
 
     });
 
@@ -83,7 +84,8 @@ function loadSurveyData(callback){
 
     type:"get",
 
     success:function(httpResult){
 
       if(httpResult.resultCode==401){
 
-        window.location.href="/login";
 
+        // window.location.href="/dw/#/login";
 
+        window.location.href="/dw/#/401";
 
       }
 
       //surveyName
 
       if(httpResult.resultCode==200){

+ 1 - 1
static/diaowen/message.html
Fájl Megtekintése 

@@ -51,7 +51,7 @@
 
         <a href="#" ></a>
 
       </div>
 
       <div id="ruleCodeDiv" style="padding: 10px;display: none;">
 
-        <form action="/static/diaowen/answer-p.html" method="get">
 
+        <form action="/dw/static/diaowen/answer-p.html" method="get">
 
           <input type="hidden" name="sid" value="">
 
           <input type="text" name="ruleCode" value="" style="padding: 6px;border: 1px solid lightgrey;" placeholder="请输入口令码">
 
           <input type="submit" value="确 认" class="sbtn24">